From nobody Sun Apr 28 16:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1560411642; cv=none; d=zoho.com; s=zohoarc; b=RvM6DBt11GKb68teem+vQMyfIS29qEWrDuZm/h86vzp9ayzeGXFxS5qahwUvcFpJRyzQLmQC/kEBcB+lEnAXAkFhEKX8P8+trbKqwRGONwSqTYBxA95MMq+zKgEcakTi4kg0+N76CSBx5xIkISnpdh7YGKUawHBJpdiRBriKwQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560411642; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=K65e4mUDPHTmDAXbgthKVIbN8FZ4R73FNq7skooTASc=; b=gSMkVf+jh0ir4OF3w++d9wucLZhuNUhyRAGHQ8+fSLAxARthrmnqkKGR4lDcA5hJJhMyJBDl7GMywmcPX/E76d9kBHI7eO47O8dSFVk4bNWmG5pj4Dk4b634AfieFrLryR3zRQA3/vCxs2Wt8A8H+KZuQoBNRGWQpBusU6KAAEA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1560411642901954.7552557799759; Thu, 13 Jun 2019 00:40:42 -0700 (PDT) Received: from localhost ([::1]:37480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbKL8-0005QH-98 for importer@patchew.org; Thu, 13 Jun 2019 03:40:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52845) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbKJn-00044C-2B for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbKJl-00064a-UR for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbKJl-00063s-OR for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B4C330001DD; Thu, 13 Jun 2019 07:38:40 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A018600C0; Thu, 13 Jun 2019 07:38:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4C16017510; Thu, 13 Jun 2019 09:38:34 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 09:38:33 +0200 Message-Id: <20190613073834.22001-2-kraxel@redhat.com> In-Reply-To: <20190613073834.22001-1-kraxel@redhat.com> References: <20190613073834.22001-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 13 Jun 2019 07:38:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] edid: add xmax + ymax properties 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: "Michael S. Tsirkin" , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add new properties to allow setting the maximum display resolution. Resolutions larger than that will not be included in the mode list. In linux guests xrandr can be used to list modes. Note: The existing xres and yres properties set the preferred display resolution, i.e. the mode should be first in the mode list and guests should use it by default. Signed-off-by: Gerd Hoffmann Message-id: 20190607083429.31943-1-kraxel@redhat.com --- include/hw/display/edid.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index bacf1708894b..7948bd2c40f8 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -22,6 +22,8 @@ void qemu_edid_region_io(MemoryRegion *region, Object *ow= ner, =20 #define DEFINE_EDID_PROPERTIES(_state, _edid_info) \ DEFINE_PROP_UINT32("xres", _state, _edid_info.prefx, 0), \ - DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0) + DEFINE_PROP_UINT32("yres", _state, _edid_info.prefy, 0), \ + DEFINE_PROP_UINT32("xmax", _state, _edid_info.maxx, 0), \ + DEFINE_PROP_UINT32("ymax", _state, _edid_info.maxy, 0) =20 #endif /* EDID_H */ --=20 2.18.1 From nobody Sun Apr 28 16:27:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1560411617; cv=none; d=zoho.com; s=zohoarc; b=NDTS4TmuZKDJv+ujhll6xkeKwm2YlR9addV5YYXNc/clzq+zz9yAlSIuobPBeKxQFn70JAdyFqUg6np34MMR/sJtS07hji9oHHtBkUFKOBJcCUR4Rauzl/GRwdCWtdt4iUxPYJTIg9iYqnuM5FImjGeNm65QI43v3HAgXY0gzps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560411617; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WgZEXauEKaZ0bNsNO9XDzMxFMJ/OOg48Z4PztBVKcEE=; b=fdu1wTRDW6QlBGwTOOgbe6sJLv5fwdB1JcXcV/2yhAk4oxqWnQDzvQcVWNrHznQhIcRBG01QGN4vozyJn73j7moqQI4G65ECTo+I3coinUN30JgbfLs+94TU604YgzC4YMG0hRrTSxvI1qs13ZwMjPjmY5+HK4BsMOcvpcQuamc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560411617129708.1618624254204; Thu, 13 Jun 2019 00:40:17 -0700 (PDT) Received: from localhost ([::1]:37484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbKLB-0005W2-2d for importer@patchew.org; Thu, 13 Jun 2019 03:40:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52873) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbKJo-00044R-SN for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbKJn-00065i-JI for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbKJn-000658-9W for qemu-devel@nongnu.org; Thu, 13 Jun 2019 03:38:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 965E5C057E65; Thu, 13 Jun 2019 07:38:42 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97A8260C8B; Thu, 13 Jun 2019 07:38:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 58A4317512; Thu, 13 Jun 2019 09:38:34 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 09:38:34 +0200 Message-Id: <20190613073834.22001-3-kraxel@redhat.com> In-Reply-To: <20190613073834.22001-1-kraxel@redhat.com> References: <20190613073834.22001-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 13 Jun 2019 07:38:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] edid: flip the default to enabled 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: "Michael S. Tsirkin" , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Message-id: 20190607083444.32175-1-kraxel@redhat.com --- include/hw/virtio/virtio-gpu.h | 2 +- hw/core/machine.c | 8 +++++++- hw/display/bochs-display.c | 2 +- hw/display/vga-pci.c | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 8ecac1987a7f..6dd57f2025ec 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -125,7 +125,7 @@ typedef struct VirtIOGPUBaseClass { #define VIRTIO_GPU_BASE_PROPERTIES(_state, _conf) \ DEFINE_PROP_UINT32("max_outputs", _state, _conf.max_outputs, 1), \ DEFINE_PROP_BIT("edid", _state, _conf.flags, \ - VIRTIO_GPU_FLAG_EDID_ENABLED, false), \ + VIRTIO_GPU_FLAG_EDID_ENABLED, true), \ DEFINE_PROP_UINT32("xres", _state, _conf.xres, 1024), \ DEFINE_PROP_UINT32("yres", _state, _conf.yres, 768) =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index f1a0f45f9c83..84ebb8d24701 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -24,7 +24,13 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" =20 -GlobalProperty hw_compat_4_0_1[] =3D {}; +GlobalProperty hw_compat_4_0_1[] =3D { + { "VGA", "edid", "false" }, + { "secondary-vga", "edid", "false" }, + { "bochs-display", "edid", "false" }, + { "virtio-vga", "edid", "false" }, + { "virtio-gpu-pci", "edid", "false" }, +}; const size_t hw_compat_4_0_1_len =3D G_N_ELEMENTS(hw_compat_4_0_1); =20 GlobalProperty hw_compat_4_0[] =3D {}; diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 0a2a3e27c446..582133dd719c 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -338,7 +338,7 @@ static void bochs_display_exit(PCIDevice *dev) =20 static Property bochs_display_properties[] =3D { DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB), - DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, false), + DEFINE_PROP_BOOL("edid", BochsDisplayState, enable_edid, true), DEFINE_EDID_PROPERTIES(BochsDisplayState, edid_info), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index c66d9ec7ee24..dedac5d1289f 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -340,7 +340,7 @@ static Property vga_pci_properties[] =3D { DEFINE_PROP_BIT("qemu-extended-regs", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true), DEFINE_PROP_BIT("edid", - PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false), + PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, fa= lse), DEFINE_PROP_END_OF_LIST(), @@ -351,7 +351,7 @@ static Property secondary_pci_properties[] =3D { DEFINE_PROP_BIT("qemu-extended-regs", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_QEXT, true), DEFINE_PROP_BIT("edid", - PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, false), + PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), DEFINE_PROP_END_OF_LIST(), }; --=20 2.18.1