From nobody Fri May 10 01:37:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597665741; cv=none; d=zohomail.com; s=zohoarc; b=nWR4nafhThx4fdMWrbEzRoSDnjvcuQFeeLD9dkkm47kXtGIgw0Fvmq/S/05rkdoFz8vC46KmCJFiAkTf7mPmhW0ZZWsyowTGoyiNJcz6RHOK+xvPMj5v4JmXjseBfQyhgfzy21K4BJve1FYpbregx5TzhkCwH7heMWDtOxC/JEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597665741; 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=/SGi55q2jwB6TI3P6SfjHR5zRUnfzg+rtb4hqKPtTco=; b=KT+nkFe96L5ucLttQ8xt6B45RDaEAe7kMT7DftHLoQs76qOuVC2sVKqDyIuL2FHdpBkJ2eeRGITyXJc+w4M8GPEnvcyKba7PipZ9qX/R+ee2iwB9tu+buD8vyNN6Gf/0KqtQzoOOdNbuYFUdUQeD4YusynC2lTQFF0oHjHjdH3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597665741209518.3042343405; Mon, 17 Aug 2020 05:02:21 -0700 (PDT) Received: from localhost ([::1]:60972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7dqC-0006Gu-R7 for importer@patchew.org; Mon, 17 Aug 2020 08:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7dpC-000575-FB for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:14 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42473 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7dpA-0003f9-Bk for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:14 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-eGBrfme3OsWr-sn8pEWbyQ-1; Mon, 17 Aug 2020 08:01:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64014CF983 for ; Mon, 17 Aug 2020 12:01:07 +0000 (UTC) Received: from localhost (unknown [10.36.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 658385D9D2; Mon, 17 Aug 2020 12:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597665671; 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=/SGi55q2jwB6TI3P6SfjHR5zRUnfzg+rtb4hqKPtTco=; b=ALC3OvFacbw5A4JOXeGoAwPFWwEo4YHIZ81xyvTCHwD7QQXehiOpniVMkr9HtRPcIU06cM kJZXHYlSjif2EXeUqHhzw6LjW5uINKf4p0JuQKPmg61t4uRv+joa1FJ2xaYgu/wl3xOtaF AdaMrHIDA/BKbU3KDOKGgJ+fPdHmZ84= X-MC-Unique: eGBrfme3OsWr-sn8pEWbyQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 1/4] edid: use physical dimensions if available Date: Mon, 17 Aug 2020 16:00:53 +0400 Message-Id: <20200817120056.56751-2-marcandre.lureau@redhat.com> In-Reply-To: <20200817120056.56751-1-marcandre.lureau@redhat.com> References: <20200817120056.56751-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 03:34:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Add width_mm/height_mm to qemu_edid_info, and use it if it is set (non-zero) to generate the EDID. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/edid-generate.c | 21 +++++++++++++-------- include/hw/display/edid.h | 2 ++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c index e58472fde5..14cfb94447 100644 --- a/hw/display/edid-generate.c +++ b/hw/display/edid-generate.c @@ -205,12 +205,8 @@ static void edid_desc_dummy(uint8_t *desc) =20 static void edid_desc_timing(uint8_t *desc, uint32_t xres, uint32_t yres, - uint32_t dpi) + uint32_t xmm, uint32_t ymm) { - /* physical display size */ - uint32_t xmm =3D xres * dpi / 254; - uint32_t ymm =3D yres * dpi / 254; - /* pull some realistic looking timings out of thin air */ uint32_t xfront =3D xres * 25 / 100; uint32_t xsync =3D xres * 3 / 100; @@ -296,6 +292,7 @@ void qemu_edid_generate(uint8_t *edid, size_t size, uint32_t desc =3D 54; uint8_t *xtra3 =3D NULL; uint8_t *dta =3D NULL; + uint32_t width_mm, height_mm; =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D set defaults =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 @@ -314,6 +311,13 @@ void qemu_edid_generate(uint8_t *edid, size_t size, if (!info->prefy) { info->prefy =3D 768; } + if (info->width_mm && info->height_mm) { + width_mm =3D info->width_mm; + height_mm =3D info->height_mm; + } else { + width_mm =3D info->prefx * info->dpi / 254; + height_mm =3D info->prefy * info->dpi / 254; + } =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D extensions =3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 @@ -360,8 +364,8 @@ void qemu_edid_generate(uint8_t *edid, size_t size, edid[20] =3D 0xa5; =20 /* screen size: undefined */ - edid[21] =3D info->prefx * 254 / 100 / info->dpi; - edid[22] =3D info->prefy * 254 / 100 / info->dpi; + edid[21] =3D width_mm / 10; + edid[22] =3D height_mm / 10; =20 /* display gamma: 2.2 */ edid[23] =3D 220 - 100; @@ -387,7 +391,8 @@ void qemu_edid_generate(uint8_t *edid, size_t size, =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D descriptor blocks =3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 - edid_desc_timing(edid + desc, info->prefx, info->prefy, info->dpi); + edid_desc_timing(edid + desc, info->prefx, info->prefy, + width_mm, height_mm); desc +=3D 18; =20 edid_desc_ranges(edid + desc); diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index 5b1de57f24..f98b49a944 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -6,6 +6,8 @@ typedef struct qemu_edid_info { const char *name; const char *serial; uint32_t dpi; + uint16_t width_mm; + uint16_t height_mm; uint32_t prefx; uint32_t prefy; uint32_t maxx; --=20 2.26.2 From nobody Fri May 10 01:37:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597665747; cv=none; d=zohomail.com; s=zohoarc; b=cFrEjGsylGRqCZM7FQb7+RVAYfLzbXp0THfj6yfwF+stt7Gr0FKuD3olk4/Uvx+MeB8TTXPDEruP7o0BZNsPRo1cfkwH3esZB2v2wUPWj2dB8lYdTOaDrrHjvQKID683EuyeaezykOnEggrI87DhXQKILF/XTvhb9iE6be/i5Vg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597665747; 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=TSC2eOKE0NQbqwjE3v+4TyCChUK9VcdeLXUZxTLG/Js=; b=RGmmuzpsrCCezWKqmow7++1tA3+QSgoBcZOkq85FUSCjp3ZG4DPCE/yXbe00Ya48f9vU15eOxvnkTsZJAtRVJgxrGqxOssrQNmF3xmqpECDI1C3ZxmJ3HgSSYz56DyJ2grIB3cc1xhaROlnm/xpcWUMb91diNMNeo9tga6WjMWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597665747412824.2563936031304; Mon, 17 Aug 2020 05:02:27 -0700 (PDT) Received: from localhost ([::1]:33214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7dqL-0006Sr-H3 for importer@patchew.org; Mon, 17 Aug 2020 08:02:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7dpH-0005C2-LN for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7dpF-0003fg-RK for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-263-z-S0Ko5GNMiKc5SfnJScbA-1; Mon, 17 Aug 2020 08:01:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94D0051AF for ; Mon, 17 Aug 2020 12:01:12 +0000 (UTC) Received: from localhost (unknown [10.36.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 580A35D9D2; Mon, 17 Aug 2020 12:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597665677; 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=TSC2eOKE0NQbqwjE3v+4TyCChUK9VcdeLXUZxTLG/Js=; b=Txt5NJVcHoSc+RXN6JUrEEXkwWIWcluUdD4rP6DUc0EcNwlD77hr97Iz6jKty1EQ4rTxB9 dTRGaFTW+kQ+ldb3cQ2MmUjpsB5tDM4b0Ot9s8OOL7C+8NZZQSP3oHd1KU53Lbu2jX1qKO SaQYRelxpiK216yegVpKSjPm33Um3oQ= X-MC-Unique: z-S0Ko5GNMiKc5SfnJScbA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 2/4] ui: add getter for UIInfo Date: Mon, 17 Aug 2020 16:00:54 +0400 Message-Id: <20200817120056.56751-3-marcandre.lureau@redhat.com> In-Reply-To: <20200817120056.56751-1-marcandre.lureau@redhat.com> References: <20200817120056.56751-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 02:47:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau The following patch is going to introduce extra fields / details to UIInfo. Add a getter and keep the current values, instead of memset(0) Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/console.c | 7 +++++++ ui/spice-display.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c index 0579be792f..2a0d191d4e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1513,6 +1513,13 @@ bool dpy_ui_info_supported(QemuConsole *con) return con->hw_ops->ui_info !=3D NULL; } =20 +const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con) +{ + assert(con !=3D NULL); + + return &con->ui_info; +} + int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info) { assert(con !=3D NULL); diff --git a/ui/spice-display.c b/ui/spice-display.c index 19632fdf6c..625d9232b9 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -672,7 +672,7 @@ static int interface_client_monitors_config(QXLInstance= *sin, return 1; } =20 - memset(&info, 0, sizeof(info)); + info =3D *dpy_get_ui_info(ssd->dcl.con); =20 if (mc->num_of_monitors =3D=3D 1) { /* --=20 2.26.2 From nobody Fri May 10 01:37:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597665829; cv=none; d=zohomail.com; s=zohoarc; b=JY94kRR8cfQwCsRWseuD114li0HDFVdpqMdj+CbRWEiy8s2zBRw4xEaWzAFuKgcxz4PtMUFCTu3fygbZ9z5s1865vh84aC51sxm7QO5PM8HAJiGJoLtPLa6XWLoweJSb8hcnmVhcxUGryJLdEli/Y+kz3cznxT5SQcDnnqH48Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597665829; 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=KnTZ8fSNYZm8BnGf3vXMOJX1rM8xJLNxvNHAMR2YpCA=; b=nLzrn8NhWlqscYDcEn1/4RqgFp3lgqzn+WFQ8LRACzgo49Ac1vaGJ+nc0T5kis1TOD04axQzTAypwtGNgQ8017gYhR7rp6fFOucN2xzlcmXh3sbpWth49syaJGgbbAGQsJq0MZeN7ZZqh05vbr0UP7KwC8UwfNXHRSwpM5Wrp54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597665829706365.52184010456904; Mon, 17 Aug 2020 05:03:49 -0700 (PDT) Received: from localhost ([::1]:38462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7drf-0000Cp-Sa for importer@patchew.org; Mon, 17 Aug 2020 08:03:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7dpM-0005JW-3B for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7dpJ-0003g4-V0 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-M_nMDv7jMDKGm4fxEne1tg-1; Mon, 17 Aug 2020 08:01:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C1201854FDC for ; Mon, 17 Aug 2020 12:01:18 +0000 (UTC) Received: from localhost (unknown [10.36.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A6E31A92A; Mon, 17 Aug 2020 12:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597665680; 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=KnTZ8fSNYZm8BnGf3vXMOJX1rM8xJLNxvNHAMR2YpCA=; b=ajUvR0fQmgnmTZY/kWGEgjg3efeFW1iclbOJB8FEt8UITFYLIXC8tP8ftWkyFCOaMfoc9Z lDNVgaPX2tZUPV7NPlyPdfQCbvMNzFTVyOYStRfP6ntxZhpailhIBzQq654xsFJK4JjlDn ejP5O3PuN13pIvLjojXqDoRe/h2ZNd4= X-MC-Unique: M_nMDv7jMDKGm4fxEne1tg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 3/4] spice: get monitors physical dimension Date: Mon, 17 Aug 2020 16:00:55 +0400 Message-Id: <20200817120056.56751-4-marcandre.lureau@redhat.com> In-Reply-To: <20200817120056.56751-1-marcandre.lureau@redhat.com> References: <20200817120056.56751-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 01:24:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Note that for consistency, we use the same logic as MonitorsConfig to figure out the associated monitor. However, I can't find traces of the discussion/patches about the "new spice-server" behaviour: it still uses the multiple-configurations path in git master. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/console.h | 4 ++++ ui/spice-display.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index f35b4fc082..c334b92e70 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -133,6 +133,9 @@ typedef struct DisplaySurface { } DisplaySurface; =20 typedef struct QemuUIInfo { + /* physical dimension */ + uint16_t width_mm; + uint16_t height_mm; /* geometry */ int xoff; int yoff; @@ -278,6 +281,7 @@ void update_displaychangelistener(DisplayChangeListener= *dcl, void unregister_displaychangelistener(DisplayChangeListener *dcl); =20 bool dpy_ui_info_supported(QemuConsole *con); +const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con); int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info); =20 void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h); diff --git a/ui/spice-display.c b/ui/spice-display.c index 625d9232b9..93d4e1c0a4 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -657,6 +657,53 @@ static void interface_set_client_capabilities(QXLInsta= nce *sin, /* nothing to do */ } =20 +#if SPICE_INTERFACE_QXL_MAJOR >=3D 3 && SPICE_INTERFACE_QXL_MINOR >=3D 4 +static int interface_client_monitors_mm(QXLInstance *sin, VDAgentMonitorsM= M *mm) +{ + SimpleSpiceDisplay *ssd =3D container_of(sin, SimpleSpiceDisplay, qxl); + QemuUIInfo info; + int head; + + if (!dpy_ui_info_supported(ssd->dcl.con)) { + return 0; /* =3D=3D not supported by guest */ + } + + if (!mm) { + return 1; + } + + info =3D *dpy_get_ui_info(ssd->dcl.con); + /* Note: this code doesn't handle Spice multi-head support, where mult= iple + * monitor configuration for a single QXL device means multiple head. = */ + if (mm->num_of_monitors =3D=3D 1) { + /* + * New spice-server version which filters the list of monitors + * to only include those that belong to our display channel. + * + * single-head configuration (where filtering doesn't matter) + * takes this code path too. + */ + info.width_mm =3D mm->monitors[0].width; + info.height_mm =3D mm->monitors[0].height; + } else { + /* + * Old spice-server which gives us all monitors, so we have to + * figure ourself which entry we need. Array index is the + * channel_id, which is the qemu console index, see + * qemu_spice_add_display_interface(). + */ + head =3D qemu_console_get_index(ssd->dcl.con); + if (mm->num_of_monitors > head) { + info.width_mm =3D mm->monitors[head].width; + info.height_mm =3D mm->monitors[head].height; + } + } + + dpy_set_ui_info(ssd->dcl.con, &info); + return 1; +} +#endif + static int interface_client_monitors_config(QXLInstance *sin, VDAgentMonitorsConfig *mc) { @@ -674,6 +721,8 @@ static int interface_client_monitors_config(QXLInstance= *sin, =20 info =3D *dpy_get_ui_info(ssd->dcl.con); =20 + /* Note: this code doesn't handle Spice multi-head support, where mult= iple + * monitor configuration for a single QXL device means multiple head. = */ if (mc->num_of_monitors =3D=3D 1) { /* * New spice-server version which filters the list of monitors @@ -728,6 +777,9 @@ static const QXLInterface dpy_interface =3D { .update_area_complete =3D interface_update_area_complete, .set_client_capabilities =3D interface_set_client_capabilities, .client_monitors_config =3D interface_client_monitors_config, +#if SPICE_INTERFACE_QXL_MAJOR >=3D 3 && SPICE_INTERFACE_QXL_MINOR >=3D 4 + .client_monitors_mm =3D interface_client_monitors_mm, +#endif }; =20 static void display_update(DisplayChangeListener *dcl, --=20 2.26.2 From nobody Fri May 10 01:37:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597665826; cv=none; d=zohomail.com; s=zohoarc; b=azVwhdWfOsH7HzWdmYSNfnkEKZVSxNHlpwUeIPvciIJfgqgjP7/V7tLw+cQ+FVsGStajMTUW3bcHcM6316jLfZBvZimZHYfIB8okOarKIqDTQESVD8xOLN+KqKtN69dPpSOeRy/4v4ot2EM7J5FYoPP7r0DMhHYbW/VCC1nDD2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597665826; 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=BgMRfNw/dcdFf79MofA88RErXDiLIbDVlTg7mtSmZKA=; b=doq7VLBHuVThQzIgsqx6oMBLpZ67untKOVtQiibLw772p+xZbdeBkeWkfsorLl9DLQ/IdcAdIlHpcJjmGYGknauB/ngh0MbXbVPVsmVNp7COfzkcAbu2ryAMdLQSOYksuGyBBi1iH2BdKadzXcjbzjYHoxDmK4G/xq1KfSJiczY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159766582687838.21527179544; Mon, 17 Aug 2020 05:03:46 -0700 (PDT) Received: from localhost ([::1]:38236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7drc-00006u-Kq for importer@patchew.org; Mon, 17 Aug 2020 08:03:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7dpT-0005UR-1Y for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:31 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:48815 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7dpR-0003gH-4K for qemu-devel@nongnu.org; Mon, 17 Aug 2020 08:01:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-302T-YQYOPepqfsVcWfaOA-1; Mon, 17 Aug 2020 08:01:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 891991005E61 for ; Mon, 17 Aug 2020 12:01:23 +0000 (UTC) Received: from localhost (unknown [10.36.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9671110023A5; Mon, 17 Aug 2020 12:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597665688; 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=BgMRfNw/dcdFf79MofA88RErXDiLIbDVlTg7mtSmZKA=; b=aYu9DAHZuKaZpBah0PmPqRHBdbBsIAQEDP8xts4nB5S581dryh368+i/DUffbXEPODkGr5 hG8yyRM6JjoPltHZl1BVuYY5vgUuqH+CW4e+Z/f57Ij/ZINqIMjwbPbrcVbDaGYK2k+ZEi Z0PMdgjXh9usnwwtbnqDiCHCCWsQOVc= X-MC-Unique: 302T-YQYOPepqfsVcWfaOA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 4/4] virtio-gpu: set physical dimensions for EDID Date: Mon, 17 Aug 2020 16:00:56 +0400 Message-Id: <20200817120056.56751-5-marcandre.lureau@redhat.com> In-Reply-To: <20200817120056.56751-1-marcandre.lureau@redhat.com> References: <20200817120056.56751-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/17 05:03:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/virtio-gpu-base.c | 2 ++ hw/display/virtio-gpu.c | 2 ++ include/hw/virtio/virtio-gpu.h | 1 + 3 files changed, 5 insertions(+) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 7961308606..2fb8beb7da 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -82,6 +82,8 @@ static int virtio_gpu_ui_info(void *opaque, uint32_t idx,= QemuUIInfo *info) g->req_state[idx].y =3D info->yoff; g->req_state[idx].width =3D info->width; g->req_state[idx].height =3D info->height; + g->req_state[idx].width_mm =3D info->width_mm; + g->req_state[idx].height_mm =3D info->height_mm; =20 if (info->width && info->height) { g->enabled_output_bitmask |=3D (1 << idx); diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 5f0dd7c150..28c390078a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -212,6 +212,8 @@ virtio_gpu_generate_edid(VirtIOGPU *g, int scanout, { 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, }; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 6dd57f2025..3d1adc563c 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -65,6 +65,7 @@ struct virtio_gpu_scanout { }; =20 struct virtio_gpu_requested_state { + uint16_t width_mm, height_mm; uint32_t width, height; int x, y; }; --=20 2.26.2