From nobody Fri May 17 10:44:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687798141; cv=none; d=zohomail.com; s=zohoarc; b=TdH7OZ/mxyiG/9xZJIJZ3YcR83paRlnipB8M/1FYMU6Ju/XWJnvjqvfp3K77ZzVGnSohAlgKnhbUpIgiFazJskMEKjNp8jfFTkxO+aYfgH0z6CvMVGFyZSh+NVm9l3azILdYaohW5e5krH741Bms6ydRtAc3a8Ci/f/BjRNGiP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687798141; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R0rLjw9HrUl8/y10A/yfzDbjdxD2B3xXbLLyuqxdEwc=; b=nsKzy18+bvDC25/rXwp9hCWW3urbNcRRw+YAf5d0y1rlgsMAMr69nKZWP3bDpGZ1SDpDbOebHDGzlroH7lmF04fe++/uykrKdW+Os9IzxG4RPDmOtDJeb54d/zSDZ1/BAeKxQOt4bMUckqBhPVCLfN9BtZvU2AwgAjSK0Eh954A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1687798141671896.7921060589268; Mon, 26 Jun 2023 09:49:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDpNa-0001J0-Sg; Mon, 26 Jun 2023 12:47:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNE-00019t-8I for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNC-00029l-1H for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-26-KWUcVfVANUGMlNtWIGJSVQ-1; Mon, 26 Jun 2023 12:47:24 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC994185A795 for ; Mon, 26 Jun 2023 16:47:23 +0000 (UTC) Received: from centennial.enunes.eu.com (unknown [10.67.24.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 422CB1121319; Mon, 26 Jun 2023 16:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687798047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R0rLjw9HrUl8/y10A/yfzDbjdxD2B3xXbLLyuqxdEwc=; b=FjNsT8JpUoCS4OejjMsNLExCoIOrQI9LKaYSrJIbSd85WarVTBYk44m+QnztEYZ9DRfJOu JJXIcs+a2rf3LOhKz5XwFobwJ+6o4M5hBrEqKyr+pS/0l/Pir85fKXHIZQIiCjALRCx2cj NYsLhUDYyU6TI2RcB5OVbLZGvNi6cD8= X-MC-Unique: KWUcVfVANUGMlNtWIGJSVQ-1 From: Erico Nunes To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, mst@redhat.com, kraxel@redhat.com, Erico Nunes Subject: [PATCH v4 1/4] virtio-gpu: refactor generate_edid function to virtio_gpu_base Date: Mon, 26 Jun 2023 18:47:05 +0200 Message-Id: <20230626164708.1163239-2-ernunes@redhat.com> In-Reply-To: <20230626164708.1163239-1-ernunes@redhat.com> References: <20230626164708.1163239-1-ernunes@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=ernunes@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687798143546100005 This functionality can be shared with upcoming use in vhost-user-gpu, so move it to the shared file to avoid duplicating it. Signed-off-by: Erico Nunes Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/virtio-gpu-base.c | 17 +++++++++++++++++ hw/display/virtio-gpu.c | 20 +------------------- include/hw/virtio/virtio-gpu.h | 2 ++ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index a29f191aa8..7ab7d08d0a 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -17,6 +17,7 @@ #include "migration/blocker.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "hw/display/edid.h" #include "trace.h" =20 void @@ -51,6 +52,22 @@ virtio_gpu_base_fill_display_info(VirtIOGPUBase *g, } } =20 +void +virtio_gpu_base_generate_edid(VirtIOGPUBase *g, int scanout, + struct virtio_gpu_resp_edid *edid) +{ + qemu_edid_info info =3D { + .width_mm =3D g->req_state[scanout].width_mm, + .height_mm =3D g->req_state[scanout].height_mm, + .prefx =3D g->req_state[scanout].width, + .prefy =3D g->req_state[scanout].height, + .refresh_rate =3D g->req_state[scanout].refresh_rate, + }; + + edid->size =3D cpu_to_le32(sizeof(edid->edid)); + qemu_edid_generate(edid->edid, sizeof(edid->edid), &info); +} + static void virtio_gpu_invalidate_display(void *opaque) { } diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 66cddd94d9..9ff1a43353 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -24,7 +24,6 @@ #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-bus.h" -#include "hw/display/edid.h" #include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" @@ -207,23 +206,6 @@ void virtio_gpu_get_display_info(VirtIOGPU *g, sizeof(display_info)); } =20 -static void -virtio_gpu_generate_edid(VirtIOGPU *g, int scanout, - struct virtio_gpu_resp_edid *edid) -{ - VirtIOGPUBase *b =3D VIRTIO_GPU_BASE(g); - qemu_edid_info info =3D { - .width_mm =3D b->req_state[scanout].width_mm, - .height_mm =3D b->req_state[scanout].height_mm, - .prefx =3D b->req_state[scanout].width, - .prefy =3D b->req_state[scanout].height, - .refresh_rate =3D b->req_state[scanout].refresh_rate, - }; - - edid->size =3D cpu_to_le32(sizeof(edid->edid)); - qemu_edid_generate(edid->edid, sizeof(edid->edid), &info); -} - void virtio_gpu_get_edid(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) { @@ -242,7 +224,7 @@ void virtio_gpu_get_edid(VirtIOGPU *g, trace_virtio_gpu_cmd_get_edid(get_edid.scanout); memset(&edid, 0, sizeof(edid)); edid.hdr.type =3D VIRTIO_GPU_RESP_OK_EDID; - virtio_gpu_generate_edid(g, get_edid.scanout, &edid); + virtio_gpu_base_generate_edid(VIRTIO_GPU_BASE(g), get_edid.scanout, &e= did); virtio_gpu_ctrl_response(g, cmd, &edid.hdr, sizeof(edid)); } =20 diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 2e28507efe..39c1a6a6ea 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -239,6 +239,8 @@ void virtio_gpu_base_reset(VirtIOGPUBase *g); void virtio_gpu_base_fill_display_info(VirtIOGPUBase *g, struct virtio_gpu_resp_display_info *dpy_info); =20 +void virtio_gpu_base_generate_edid(VirtIOGPUBase *g, int scanout, + struct virtio_gpu_resp_edid *edid); /* virtio-gpu.c */ void virtio_gpu_ctrl_response(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd, --=20 2.40.1 From nobody Fri May 17 10:44:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687798162; cv=none; d=zohomail.com; s=zohoarc; b=mR+fzeUi92MFa2kP7pftvpQDwnR+dlGB5zxUCzYMfl/YXy8KNUh+ICUzJFWK9RqJw2bOj7LcXjaPe1ZmzBQHZjqpoZC4Sf2Nf8+kWagMlg7JLAIzi76vGbg9l/cOnEOOfOMBO0NhP68zjqVch61EE7K6HjI2uJ3h4xCVKi5l9N4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687798162; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5GI/qdvUcG0+hk7noC5Z46oHKpjYFrioG//NljqI8+U=; b=Es7UhsTrb8Bw9vcCwqdInPwq09MiYHSq9/xEittNsJ1D0MnAB6NwJBA7nCR69szaeGMdlnECyQU+dzDgEC0YhzUPBjjlrJ14ixbdv/CP6g/BuhkkmDsY5tgt44ew6GTd+eaCcwv/daRyfqAbRsvkGL94sj7Doa2Zj+tnGTDWaag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1687798162038411.2165101479419; Mon, 26 Jun 2023 09:49:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDpNd-0001Qt-2q; Mon, 26 Jun 2023 12:47:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNI-0001Ba-6W for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNF-0002Aa-UG for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:35 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-531-t3XJdjE5Mg-KiM6uwzpeqw-1; Mon, 26 Jun 2023 12:47:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BEF91280AA2A for ; Mon, 26 Jun 2023 16:47:28 +0000 (UTC) Received: from centennial.enunes.eu.com (unknown [10.67.24.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D2481121319; Mon, 26 Jun 2023 16:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687798053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5GI/qdvUcG0+hk7noC5Z46oHKpjYFrioG//NljqI8+U=; b=P177hEU2+FYkXcH69BovmxzbCLcm0193XpHdpYm7JgPWyl7YHmmWhIOfBEQqfPH36rP9Nv cMJOjadEYfbU/07SBd6h476gUnrRD7MpbZcuY8AoNIq51WO3EOu5pxyfFhZxJdQ0wpW2wh EvOySUt1w+B1B4HbLFuyZul2qG5kTiE= X-MC-Unique: t3XJdjE5Mg-KiM6uwzpeqw-1 From: Erico Nunes To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, mst@redhat.com, kraxel@redhat.com, Erico Nunes Subject: [PATCH v4 2/4] docs: vhost-user-gpu: add protocol changes for EDID Date: Mon, 26 Jun 2023 18:47:06 +0200 Message-Id: <20230626164708.1163239-3-ernunes@redhat.com> In-Reply-To: <20230626164708.1163239-1-ernunes@redhat.com> References: <20230626164708.1163239-1-ernunes@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=ernunes@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687798164188100001 VHOST_USER_GPU_GET_EDID is defined as a message from the backend to the frontend to retrieve the EDID data for a given scanout. The VHOST_USER_GPU_PROTOCOL_F_EDID protocol feature is defined as a way to check whether this new message is supported or not. Signed-off-by: Erico Nunes Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/interop/vhost-user-gpu.rst | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/interop/vhost-user-gpu.rst b/docs/interop/vhost-user-gpu.= rst index 1640553729..b78806892d 100644 --- a/docs/interop/vhost-user-gpu.rst +++ b/docs/interop/vhost-user-gpu.rst @@ -124,6 +124,16 @@ VhostUserGpuDMABUFScanout :fourcc: ``i32``, the DMABUF fourcc =20 =20 +VhostUserGpuEdidRequest +^^^^^^^^^^^^^^^^^^^^^^^ + ++------------+ +| scanout-id | ++------------+ + +:scanout-id: ``u32``, the scanout to get edid from + + C structure ----------- =20 @@ -141,6 +151,8 @@ In QEMU the vhost-user-gpu message is implemented with = the following struct: VhostUserGpuScanout scanout; VhostUserGpuUpdate update; VhostUserGpuDMABUFScanout dmabuf_scanout; + VhostUserGpuEdidRequest edid_req; + struct virtio_gpu_resp_edid resp_edid; struct virtio_gpu_resp_display_info display_info; uint64_t u64; } payload; @@ -149,10 +161,11 @@ In QEMU the vhost-user-gpu message is implemented wit= h the following struct: Protocol features ----------------- =20 -None yet. +.. code:: c + + #define VHOST_USER_GPU_PROTOCOL_F_EDID 0 =20 -As the protocol may need to evolve, new messages and communication -changes are negotiated thanks to preliminary +New messages and communication changes are negotiated thanks to the ``VHOST_USER_GPU_GET_PROTOCOL_FEATURES`` and ``VHOST_USER_GPU_SET_PROTOCOL_FEATURES`` requests. =20 @@ -241,3 +254,12 @@ Message types Note: there is no data payload, since the scanout is shared thanks to DMABUF, that must have been set previously with ``VHOST_USER_GPU_DMABUF_SCANOUT``. + +``VHOST_USER_GPU_GET_EDID`` + :id: 11 + :request payload: ``struct VhostUserGpuEdidRequest`` + :reply payload: ``struct virtio_gpu_resp_edid`` (from virtio specificati= on) + + Retrieve the EDID data for a given scanout. + This message requires the ``VHOST_USER_GPU_PROTOCOL_F_EDID`` protocol + feature to be supported. --=20 2.40.1 From nobody Fri May 17 10:44:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687798147; cv=none; d=zohomail.com; s=zohoarc; b=F+YMF18Ip2eRBo1NsaiSnMnhfRx7AkSyJnz7h73/PXRIwDtuJEEQrfA/+Nu/S4FDeoM/fxHpPjcTxImJ79XbhEiRkNi6VgNi8srihEcEeplB5pCoDYAN2smA20FsoxRcstzXrjxVoBWp09MNnQ38/ia3Nj4E8/vqz6n24KgF3/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687798147; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KuBxXYPQEFQJThKJ0Fxs7dhH7oXNObjhDmWWapMNPII=; b=VpBcC6ef7JgYUBYB7ly6evHNlo/5KbkYlaoaVenYDxAgnTqb+erkRmbZJQMh0kM4Kr1Gdl5YIi5Ciq445x7si74U0ghya+AMOwHbTX86oYL7yp9G8vsU/D2H8X8/rRx3ejyb+AtXJwTEcv6yQOtjZt7IwuJKqA2X7Ba17AlgjhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1687798147081799.8668425818748; Mon, 26 Jun 2023 09:49:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDpNe-0001UO-44; Mon, 26 Jun 2023 12:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNZ-0001F5-7w for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNX-0002BS-Ec for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:52 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-387-1OhpCfh3NG-D5P2q29xqPA-1; Mon, 26 Jun 2023 12:47:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 607D4280AA2D for ; Mon, 26 Jun 2023 16:47:33 +0000 (UTC) Received: from centennial.enunes.eu.com (unknown [10.67.24.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB0B41121319; Mon, 26 Jun 2023 16:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687798070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KuBxXYPQEFQJThKJ0Fxs7dhH7oXNObjhDmWWapMNPII=; b=Rtu9VY4wF4eiPhlzNE6gHvJUOcnfKdDRyIakwuHuwj/fYi06stsv0oBE+rHuzh4dFzpd81 M+y44LIi6ceaB/wiXBCpqIGQ4caXcyqnZgUzaun1T/o4WZ1tKBHMfiGO34M9luDaBG8QqX lGCqQhwVdoqitdkKsVEG0SmQ0p9CCqY= X-MC-Unique: 1OhpCfh3NG-D5P2q29xqPA-1 From: Erico Nunes To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, mst@redhat.com, kraxel@redhat.com, Erico Nunes Subject: [PATCH v4 3/4] contrib/vhost-user-gpu: implement get_edid feature Date: Mon, 26 Jun 2023 18:47:07 +0200 Message-Id: <20230626164708.1163239-4-ernunes@redhat.com> In-Reply-To: <20230626164708.1163239-1-ernunes@redhat.com> References: <20230626164708.1163239-1-ernunes@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=ernunes@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687798147933100003 Implement the virtio-gpu feature in contrib/vhost-user-gpu, which was unsupported until now. In this implementation, the feature is enabled inconditionally to avoid creating another optional config argument. Similarly to get_display_info, vhost-user-gpu sends a message back to the frontend to have access to all the display information. In the case of get_edid, it also needs to pass which scanout we should retrieve the edid for. The VHOST_USER_GPU_PROTOCOL_F_EDID protocol feature is required if the frontend sets the VIRTIO_GPU_F_EDID virtio-gpu feature. If the frontend sets the virtio-gpu feature but does not support the protocol feature, the backend will abort with an error. Signed-off-by: Erico Nunes Reviewed-by: Marc-Andr=C3=A9 Lureau --- contrib/vhost-user-gpu/vhost-user-gpu.c | 73 +++++++++++++++++++++++-- contrib/vhost-user-gpu/virgl.c | 3 + contrib/vhost-user-gpu/vugpu.h | 11 ++++ 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-g= pu/vhost-user-gpu.c index bfb8d93cf8..2e7815a7a3 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -303,6 +303,53 @@ vg_get_display_info(VuGpu *vg, struct virtio_gpu_ctrl_= command *cmd) cmd->state =3D VG_CMD_STATE_PENDING; } =20 +static gboolean +get_edid_cb(gint fd, GIOCondition condition, gpointer user_data) +{ + struct virtio_gpu_resp_edid resp_edid; + VuGpu *vg =3D user_data; + struct virtio_gpu_ctrl_command *cmd =3D QTAILQ_LAST(&vg->fenceq); + + g_debug("get edid cb"); + assert(cmd->cmd_hdr.type =3D=3D VIRTIO_GPU_CMD_GET_EDID); + if (!vg_recv_msg(vg, VHOST_USER_GPU_GET_EDID, + sizeof(resp_edid), &resp_edid)) { + return G_SOURCE_CONTINUE; + } + + QTAILQ_REMOVE(&vg->fenceq, cmd, next); + vg_ctrl_response(vg, cmd, &resp_edid.hdr, sizeof(resp_edid)); + + vg->wait_in =3D 0; + vg_handle_ctrl(&vg->dev.parent, 0); + + return G_SOURCE_REMOVE; +} + +void +vg_get_edid(VuGpu *vg, struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_cmd_get_edid get_edid; + + VUGPU_FILL_CMD(get_edid); + virtio_gpu_bswap_32(&get_edid, sizeof(get_edid)); + + VhostUserGpuMsg msg =3D { + .request =3D VHOST_USER_GPU_GET_EDID, + .size =3D sizeof(VhostUserGpuEdidRequest), + .payload.edid_req =3D { + .scanout_id =3D get_edid.scanout, + }, + }; + + assert(vg->wait_in =3D=3D 0); + + vg_send_msg(vg, &msg, -1); + vg->wait_in =3D g_unix_fd_add(vg->sock_fd, G_IO_IN | G_IO_HUP, + get_edid_cb, vg); + cmd->state =3D VG_CMD_STATE_PENDING; +} + static void vg_resource_create_2d(VuGpu *g, struct virtio_gpu_ctrl_command *cmd) @@ -837,8 +884,9 @@ vg_process_cmd(VuGpu *vg, struct virtio_gpu_ctrl_comman= d *cmd) case VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING: vg_resource_detach_backing(vg, cmd); break; - /* case VIRTIO_GPU_CMD_GET_EDID: */ - /* break */ + case VIRTIO_GPU_CMD_GET_EDID: + vg_get_edid(vg, cmd); + break; default: g_warning("TODO handle ctrl %x\n", cmd->cmd_hdr.type); cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; @@ -1022,26 +1070,36 @@ vg_queue_set_started(VuDev *dev, int qidx, bool sta= rted) static gboolean protocol_features_cb(gint fd, GIOCondition condition, gpointer user_data) { + const uint64_t protocol_edid =3D (1 << VHOST_USER_GPU_PROTOCOL_F_EDID); VuGpu *g =3D user_data; - uint64_t u64; + uint64_t protocol_features; VhostUserGpuMsg msg =3D { .request =3D VHOST_USER_GPU_GET_PROTOCOL_FEATURES }; =20 - if (!vg_recv_msg(g, msg.request, sizeof(u64), &u64)) { + if (!vg_recv_msg(g, msg.request, + sizeof(protocol_features), &protocol_features)) { return G_SOURCE_CONTINUE; } =20 + protocol_features &=3D protocol_edid; + msg =3D (VhostUserGpuMsg) { .request =3D VHOST_USER_GPU_SET_PROTOCOL_FEATURES, .size =3D sizeof(uint64_t), - .payload.u64 =3D 0 + .payload.u64 =3D protocol_features, }; vg_send_msg(g, &msg, -1); =20 g->wait_in =3D 0; vg_handle_ctrl(&g->dev.parent, 0); =20 + if (g->edid_inited && !(protocol_features & protocol_edid)) { + g_printerr("EDID feature set by the frontend but it does not suppo= rt " + "the EDID vhost-user-gpu protocol.\n"); + exit(EXIT_FAILURE); + } + return G_SOURCE_REMOVE; } =20 @@ -1049,7 +1107,7 @@ static void set_gpu_protocol_features(VuGpu *g) { VhostUserGpuMsg msg =3D { - .request =3D VHOST_USER_GPU_GET_PROTOCOL_FEATURES + .request =3D VHOST_USER_GPU_GET_PROTOCOL_FEATURES, }; =20 vg_send_msg(g, &msg, -1); @@ -1086,6 +1144,7 @@ vg_get_features(VuDev *dev) if (opt_virgl) { features |=3D 1 << VIRTIO_GPU_F_VIRGL; } + features |=3D 1 << VIRTIO_GPU_F_EDID; =20 return features; } @@ -1103,6 +1162,8 @@ vg_set_features(VuDev *dev, uint64_t features) g->virgl_inited =3D true; } =20 + g->edid_inited =3D !!(features & (1 << VIRTIO_GPU_F_EDID)); + g->virgl =3D virgl; } =20 diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index 3e45e1bd33..211aa110a9 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -495,6 +495,9 @@ void vg_virgl_process_cmd(VuGpu *g, struct virtio_gpu_c= trl_command *cmd) case VIRTIO_GPU_CMD_GET_DISPLAY_INFO: vg_get_display_info(g, cmd); break; + case VIRTIO_GPU_CMD_GET_EDID: + vg_get_edid(g, cmd); + break; default: g_debug("TODO handle ctrl %x\n", cmd->cmd_hdr.type); cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index e2864bba68..f0f2069c47 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -36,6 +36,7 @@ typedef enum VhostUserGpuRequest { VHOST_USER_GPU_UPDATE, VHOST_USER_GPU_DMABUF_SCANOUT, VHOST_USER_GPU_DMABUF_UPDATE, + VHOST_USER_GPU_GET_EDID, } VhostUserGpuRequest; =20 typedef struct VhostUserGpuDisplayInfoReply { @@ -83,6 +84,10 @@ typedef struct VhostUserGpuDMABUFScanout { int fd_drm_fourcc; } QEMU_PACKED VhostUserGpuDMABUFScanout; =20 +typedef struct VhostUserGpuEdidRequest { + uint32_t scanout_id; +} QEMU_PACKED VhostUserGpuEdidRequest; + typedef struct VhostUserGpuMsg { uint32_t request; /* VhostUserGpuRequest */ uint32_t flags; @@ -93,6 +98,8 @@ typedef struct VhostUserGpuMsg { VhostUserGpuScanout scanout; VhostUserGpuUpdate update; VhostUserGpuDMABUFScanout dmabuf_scanout; + VhostUserGpuEdidRequest edid_req; + struct virtio_gpu_resp_edid resp_edid; struct virtio_gpu_resp_display_info display_info; uint64_t u64; } payload; @@ -104,6 +111,8 @@ static VhostUserGpuMsg m __attribute__ ((unused)); =20 #define VHOST_USER_GPU_MSG_FLAG_REPLY 0x4 =20 +#define VHOST_USER_GPU_PROTOCOL_F_EDID 0 + struct virtio_gpu_scanout { uint32_t width, height; int x, y; @@ -122,6 +131,7 @@ typedef struct VuGpu { =20 bool virgl; bool virgl_inited; + bool edid_inited; uint32_t inflight; =20 struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUTS]; @@ -171,6 +181,7 @@ int vg_create_mapping_iov(VuGpu *g, struct iovec **iov); void vg_cleanup_mapping_iov(VuGpu *g, struct iovec *iov, uint32_t count= ); void vg_get_display_info(VuGpu *vg, struct virtio_gpu_ctrl_command *cmd= ); +void vg_get_edid(VuGpu *vg, struct virtio_gpu_ctrl_command *cmd); =20 void vg_wait_ok(VuGpu *g); =20 --=20 2.40.1 From nobody Fri May 17 10:44:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1687798142; cv=none; d=zohomail.com; s=zohoarc; b=AAZSctnjU546I/B3u54udlUI4vssL9SvocVKu/o5aTiwmzE0lCmndvQZphnCZuRECMs58GyGEcXF3fhDZbHnQ8hD1pAf/GZTbLb+T9eEW5bGRHQJqy3HIP07keRRnJJ+DACw9GvvIXXZp+eDQNMsmc83UeIDSamEZRsHtmL/gPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687798142; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o8HpeGkkRf8eFnhSKYeoXx4UEgSpblYZ1KWtTpUNkcc=; b=XbpQvTd6o4bEFccUrgnZpJH8AgHHAfagMB2iNtGb0CMyeCaGPcQu/PWjGl4T1iWAgdvKI5KYxj+g+LvtpFi0KL2EErebzcjaaLnaWqkplLuhI14z3qBjz7QAT47ieZShvH8WI8bpYPDC4dytBRxsZsN9OKGGnksAF8JonvcfBvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1687798142202703.6100098245986; Mon, 26 Jun 2023 09:49:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDpNg-0001XL-5L; Mon, 26 Jun 2023 12:48:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNe-0001Vt-Pe for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDpNd-0002DV-63 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 12:47:58 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-179-Gp9ro20FOwirnX0cVHYjOQ-1; Mon, 26 Jun 2023 12:47:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E85B790ED53 for ; Mon, 26 Jun 2023 16:47:37 +0000 (UTC) Received: from centennial.enunes.eu.com (unknown [10.67.24.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C0A1121330; Mon, 26 Jun 2023 16:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687798076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o8HpeGkkRf8eFnhSKYeoXx4UEgSpblYZ1KWtTpUNkcc=; b=UQkUIu9EGkzRkYnwJEIGvG9BMprS2ZaAuvApHV2I8vgkg/7B8PTgmjyWJsz/uPeUkJh9P1 5Mz5cnjihpyeZ9U8b5WIkcQS0EY/DgIW/Soew4a/0MY1NXEogRj/9Bu8Tyv3CFWlDCU7TK CQ5sioA5N6+kqsPBAVpn3ZjdZpuHXJQ= X-MC-Unique: Gp9ro20FOwirnX0cVHYjOQ-1 From: Erico Nunes To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, mst@redhat.com, kraxel@redhat.com, Erico Nunes Subject: [PATCH v4 4/4] vhost-user-gpu: implement get_edid frontend feature Date: Mon, 26 Jun 2023 18:47:08 +0200 Message-Id: <20230626164708.1163239-5-ernunes@redhat.com> In-Reply-To: <20230626164708.1163239-1-ernunes@redhat.com> References: <20230626164708.1163239-1-ernunes@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=ernunes@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687798143424100003 Implement the frontend side of the get_edid feature in the qemu vhost-user-gpu frontend device. Signed-off-by: Erico Nunes Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/vhost-user-gpu.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 15f9d99d09..543ea92721 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -31,6 +31,7 @@ typedef enum VhostUserGpuRequest { VHOST_USER_GPU_UPDATE, VHOST_USER_GPU_DMABUF_SCANOUT, VHOST_USER_GPU_DMABUF_UPDATE, + VHOST_USER_GPU_GET_EDID, } VhostUserGpuRequest; =20 typedef struct VhostUserGpuDisplayInfoReply { @@ -78,6 +79,10 @@ typedef struct VhostUserGpuDMABUFScanout { int fd_drm_fourcc; } QEMU_PACKED VhostUserGpuDMABUFScanout; =20 +typedef struct VhostUserGpuEdidRequest { + uint32_t scanout_id; +} QEMU_PACKED VhostUserGpuEdidRequest; + typedef struct VhostUserGpuMsg { uint32_t request; /* VhostUserGpuRequest */ uint32_t flags; @@ -88,6 +93,8 @@ typedef struct VhostUserGpuMsg { VhostUserGpuScanout scanout; VhostUserGpuUpdate update; VhostUserGpuDMABUFScanout dmabuf_scanout; + VhostUserGpuEdidRequest edid_req; + struct virtio_gpu_resp_edid resp_edid; struct virtio_gpu_resp_display_info display_info; uint64_t u64; } payload; @@ -99,6 +106,8 @@ static VhostUserGpuMsg m __attribute__ ((unused)); =20 #define VHOST_USER_GPU_MSG_FLAG_REPLY 0x4 =20 +#define VHOST_USER_GPU_PROTOCOL_F_EDID 0 + static void vhost_user_gpu_update_blocked(VhostUserGPU *g, bool blocked); =20 static void @@ -161,6 +170,9 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) .request =3D msg->request, .flags =3D VHOST_USER_GPU_MSG_FLAG_REPLY, .size =3D sizeof(uint64_t), + .payload =3D { + .u64 =3D (1 << VHOST_USER_GPU_PROTOCOL_F_EDID) + } }; =20 vhost_user_gpu_send_msg(g, &reply); @@ -184,6 +196,26 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUs= erGpuMsg *msg) vhost_user_gpu_send_msg(g, &reply); break; } + case VHOST_USER_GPU_GET_EDID: { + VhostUserGpuEdidRequest *m =3D &msg->payload.edid_req; + struct virtio_gpu_resp_edid resp =3D { {} }; + VhostUserGpuMsg reply =3D { + .request =3D msg->request, + .flags =3D VHOST_USER_GPU_MSG_FLAG_REPLY, + .size =3D sizeof(reply.payload.resp_edid), + }; + + if (m->scanout_id >=3D g->parent_obj.conf.max_outputs) { + error_report("invalid scanout: %d", m->scanout_id); + break; + } + + resp.hdr.type =3D VIRTIO_GPU_RESP_OK_EDID; + virtio_gpu_base_generate_edid(VIRTIO_GPU_BASE(g), m->scanout_id, &= resp); + memcpy(&reply.payload.resp_edid, &resp, sizeof(resp)); + vhost_user_gpu_send_msg(g, &reply); + break; + } case VHOST_USER_GPU_SCANOUT: { VhostUserGpuScanout *m =3D &msg->payload.scanout; =20 --=20 2.40.1