From nobody Mon May 12 08:18:59 2025
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
ARC-Seal: i=1; a=rsa-sha256; t=1734553388; cv=none;
	d=zohomail.com; s=zohoarc;
	b=KxuY5+980EwRlNpiO/8girl2MViauH2ZFNh1b8N/ZLy6FrefEjwbS742BroEfpR2nMP96+YPIlTWA9tENr6tIN3mw/2H2CnAbrL+AuAqy0xqxR9fxvhMrdfgQdAHC0c0M7UwQ4tuC+6XJd8zG3AyGAMDLztG+aJI2fBmIlzrPBQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1734553388;
 h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
	bh=bzFZBJbogBtEnJRW6YeKNjestHIfylwmIdLaCxwWaB4=;
	b=eRh7FT7qC/9H4jKc2GiN3wDxUdTnePrCjq67XD/bJtTNSnWrwXBCVpmLrv5Z6cVOBtCyMSM+SJ4WQZxIchamf5c50CPcuJhOrB1LwzMOKi5E0fdaBU8L8VyYgKR1PMI9eLBFWnBNY+aQ2TyhlTVla6Ck1+xBNod/TdHQ8DjLNEc=
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
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1734553388290533.1546722305993;
 Wed, 18 Dec 2024 12:23:08 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1tO0Xg-0001Se-Ip; Wed, 18 Dec 2024 15:21:12 -0500
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 <phil@philjordan.eu>)
 id 1tO0XZ-0001Js-05
 for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:05 -0500
Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <phil@philjordan.eu>)
 id 1tO0XT-0000Fl-00
 for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:04 -0500
Received: by mail-wr1-x42f.google.com with SMTP id
 ffacd0b85a97d-385e1fcb0e1so47210f8f.2
 for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 12:20:58 -0800 (PST)
Received: from localhost.localdomain (h082218084190.host.wavenet.at.
 [82.218.84.190]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-388c80120c7sm14842267f8f.13.2024.12.18.12.20.55
 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
 Wed, 18 Dec 2024 12:20:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=philjordan-eu.20230601.gappssmtp.com; s=20230601; t=1734553257;
 x=1735158057;
 darn=nongnu.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=bzFZBJbogBtEnJRW6YeKNjestHIfylwmIdLaCxwWaB4=;
 b=iSq7F0O1ketRwecKienGTEnMDGuC7zh5ClcsDxonM0HuHvzDkN6C5bXn5vvDsPjz2m
 /N5ILDXJD2v7WtfH1wRMAWSsLvdCU+Z5mB5vwOhnONeQFfJtiD0dc4uU1+kjhf13sz6J
 g01QWpeSL0FTPe8cHlJU2DPzaG9iRx71pIDYNC7GVALGhewa773Quy6iK4slfqgVgBO3
 baRPkn0vdJxf7rk5Wms7kZYJMJQgtMLGKdKhUYhsZiK8n1TINJbb4u9f40B+q/iDBmJZ
 8zDTJSYvLHdn/1qnjX0UlOvgyw1FHloKvExnAzuPudREe4T6LGw+BmnLQF5lJk9lFxy2
 4s7Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1734553257; x=1735158057;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=bzFZBJbogBtEnJRW6YeKNjestHIfylwmIdLaCxwWaB4=;
 b=crkFXNTEhxUJGE6JD1Zezj0dTWZUDMnftUtVOF8e50FtVfi4GJXJBLsEegwkpoi4mZ
 SawKAprP2Jy4RaF7G0lnESxZwvIBNGaQK/+SYkagG/bu7PZJPAgHRv2iPE92UEpSR6SU
 70XVIoRm0iTm9J7xG/W4C5zaroIA89QFF8SACURyY0gZWS15bu7F5cP3GMJgwIVz9zTF
 RimowerLHvPi02WivCUHYbXls1PS44/AuwMv0Ip+B0LG59GZaMqnf1AVfEfsJbMgtYv4
 z+dv4I7cAZ4J95iU8gSTnen9v7NRTGfbdjYgCo8MgwWOYIhS09aMQeQtgB3hS9xR29pC
 02UA==
X-Gm-Message-State: AOJu0YynVICk9eNGRG/oY9I+QUPARXpzhxNhWdkV2GPT6Iu+HY8z46bS
 cbRk4/cDpqez8PgIoX2FBOCXT0p57M9IDRxI9LvBVkiJm+zuG9nVxMWnYj39CEmJ7VTG8X9hsU9
 luA==
X-Gm-Gg: ASbGncsRwOanZNPeNocSVg3rs38Y755BEZeR/h8CIaZUenLUchFL6+8AZFQu/n6QYBY
 1NoRsBLoQ5q0pO64NKTnzxHEqkCnGnIQvT1fES9uLydWpjhTKqOEdXWyyJ+mjOU6IJkaSYlFG00
 fWJALHH4N3IPK1tw3QJYeBjcrL6vZQC42dDIz2Z7HCuQqySM0Sc95M1on11UW7AEEvjd3kmW4LX
 7KVsiAjLLBkSH16oUnCGT3BMBV2TRi7rA42QugvpvJxL7QEZRdH24YjsMCOXfWNMe++4GMddqYe
 nCcYrDx/EiVL0TViyepBXPsdTmBubM1R
X-Google-Smtp-Source: 
 AGHT+IGcxXrPU75cBFYmBk8mLevCfBUs7FsBwYDf1gP78XChSb+0xp+4pD7k8a3X63mBFS54v/9YmQ==
X-Received: by 2002:a05:6000:1faa:b0:385:f17b:de54 with SMTP id
 ffacd0b85a97d-388e4d2f458mr4381049f8f.5.1734553257244;
 Wed, 18 Dec 2024 12:20:57 -0800 (PST)
From: Phil Dennis-Jordan <phil@philjordan.eu>
To: qemu-devel@nongnu.org
Cc: agraf@csgraf.de, phil@philjordan.eu, peter.maydell@linaro.org,
 pbonzini@redhat.com, rad@semihalf.com, quic_llindhol@quicinc.com,
 stefanha@redhat.com, mst@redhat.com, slp@redhat.com,
 richard.henderson@linaro.org, eduardo@habkost.net,
 marcel.apfelbaum@gmail.com, gaosong@loongson.cn, jiaxun.yang@flygoat.com,
 chenhuacai@kernel.org, kwolf@redhat.com, hreitz@redhat.com,
 philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com,
 alistair.francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com,
 dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
 jcmvbkbc@gmail.com, marcandre.lureau@redhat.com, berrange@redhat.com,
 akihiko.odaki@daynix.com, qemu-arm@nongnu.org, qemu-block@nongnu.org,
 qemu-riscv@nongnu.org, balaton@eik.bme.hu
Subject: [PATCH v15 04/15] hw/display/apple-gfx: Adds configurable mode list
Date: Wed, 18 Dec 2024 21:20:25 +0100
Message-Id: <20241218202036.80064-5-phil@philjordan.eu>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20241218202036.80064-1-phil@philjordan.eu>
References: <20241218202036.80064-1-phil@philjordan.eu>
MIME-Version: 1.0
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: neutral client-ip=2a00:1450:4864:20::42f;
 envelope-from=phil@philjordan.eu; helo=mail-wr1-x42f.google.com
X-Spam_score_int: -10
X-Spam_score: -1.1
X-Spam_bar: -
X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_NEUTRAL=0.779 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=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 @philjordan-eu.20230601.gappssmtp.com)
X-ZM-MESSAGEID: 1734553390629116600
Content-Type: text/plain; charset="utf-8"

This change adds a property 'display_modes' on the graphics device
which permits specifying a list of display modes. (screen resolution
and refresh rate)

The property is an array of a custom type to make the syntax slightly
less awkward to use, for example:

-device '{"driver":"apple-gfx-pci", "display-modes":["1920x1080@60", "3840x=
2160@60"]}'

Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---

v4:

 * Switched to the native array property type, which recently gained
	 command line support.
 * The property has also been added to the -mmio variant.
 * Tidied up the code a little.

v5:

 * Better error handling and buffer management in property parsing and
   output.

v6:

 * Switched to using NSMutableArray for the mode list to avoid need for
   allocating a temporary array - previously done with alloca.

v7:

 * Simplified error handling in property parsing

v8:

 * More consistent integer variable types.

v9:

 * Re-ordered type definitions so we can drop a 'struct' keyword.

v15:

 * Constified the property table.

 hw/display/apple-gfx-mmio.m |   8 +++
 hw/display/apple-gfx-pci.m  |   9 ++-
 hw/display/apple-gfx.h      |  11 +++
 hw/display/apple-gfx.m      | 135 +++++++++++++++++++++++++++++++-----
 hw/display/trace-events     |   2 +
 5 files changed, 145 insertions(+), 20 deletions(-)

diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index 1a46ff48b75..328afe8f192 100644
--- a/hw/display/apple-gfx-mmio.m
+++ b/hw/display/apple-gfx-mmio.m
@@ -258,6 +258,12 @@ static void apple_gfx_mmio_reset(Object *obj, ResetTyp=
e type)
     [s->common.pgdev reset];
 }
=20
+static const Property apple_gfx_mmio_properties[] =3D {
+    DEFINE_PROP_ARRAY("display-modes", AppleGFXMMIOState,
+                      common.num_display_modes, common.display_modes,
+                      qdev_prop_display_mode, AppleGFXDisplayMode),
+    DEFINE_PROP_END_OF_LIST(),
+};
=20
 static void apple_gfx_mmio_class_init(ObjectClass *klass, void *data)
 {
@@ -267,6 +273,8 @@ static void apple_gfx_mmio_class_init(ObjectClass *klas=
s, void *data)
     rc->phases.hold =3D apple_gfx_mmio_reset;
     dc->hotpluggable =3D false;
     dc->realize =3D apple_gfx_mmio_realize;
+
+    device_class_set_props(dc, apple_gfx_mmio_properties);
 }
=20
 static TypeInfo apple_gfx_mmio_types[] =3D {
diff --git a/hw/display/apple-gfx-pci.m b/hw/display/apple-gfx-pci.m
index 5ff6a487cfc..3e8b86b8d25 100644
--- a/hw/display/apple-gfx-pci.m
+++ b/hw/display/apple-gfx-pci.m
@@ -114,6 +114,13 @@ static void apple_gfx_pci_reset(Object *obj, ResetType=
 type)
     [s->common.pgdev reset];
 }
=20
+static const Property apple_gfx_pci_properties[] =3D {
+    DEFINE_PROP_ARRAY("display-modes", AppleGFXPCIState,
+                      common.num_display_modes, common.display_modes,
+                      qdev_prop_display_mode, AppleGFXDisplayMode),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void apple_gfx_pci_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc =3D DEVICE_CLASS(klass);
@@ -130,7 +137,7 @@ static void apple_gfx_pci_class_init(ObjectClass *klass=
, void *data)
     pci->class_id =3D PCI_CLASS_DISPLAY_OTHER;
     pci->realize =3D apple_gfx_pci_realize;
=20
-    /* TODO: Property for setting mode list */
+    device_class_set_props(dc, apple_gfx_pci_properties);
 }
=20
 static TypeInfo apple_gfx_pci_types[] =3D {
diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
index ef2455e3bdc..a1160bf6619 100644
--- a/hw/display/apple-gfx.h
+++ b/hw/display/apple-gfx.h
@@ -16,6 +16,7 @@
 #import <ParavirtualizedGraphics/ParavirtualizedGraphics.h>
 #include "qemu/typedefs.h"
 #include "exec/memory.h"
+#include "hw/qdev-properties.h"
 #include "ui/surface.h"
=20
 @class PGDeviceDescriptor;
@@ -27,6 +28,12 @@
=20
 typedef QTAILQ_HEAD(, PGTask_s) PGTaskList;
=20
+typedef struct AppleGFXDisplayMode {
+    uint16_t width_px;
+    uint16_t height_px;
+    uint16_t refresh_rate_hz;
+} AppleGFXDisplayMode;
+
 typedef struct AppleGFXState {
     /* Initialised on init/realize() */
     MemoryRegion iomem_gfx;
@@ -35,6 +42,8 @@ typedef struct AppleGFXState {
     QemuConsole *con;
     id<MTLDevice> mtl;
     id<MTLCommandQueue> mtl_queue;
+    AppleGFXDisplayMode *display_modes;
+    uint32_t num_display_modes;
=20
     /* List `tasks` is protected by task_mutex */
     QemuMutex task_mutex;
@@ -62,5 +71,7 @@ void *apple_gfx_host_ptr_for_gpa_range(uint64_t guest_phy=
sical,
                                        uint64_t length, bool read_only,
                                        MemoryRegion **mapping_in_region);
=20
+extern const PropertyInfo qdev_prop_display_mode;
+
 #endif
=20
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index bfaff2b2be2..f83ef497bf8 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -31,9 +31,10 @@
 #include "sysemu/dma.h"
 #include "ui/console.h"
=20
-static const PGDisplayCoord_t apple_gfx_modes[] =3D {
-    { .x =3D 1440, .y =3D 1080 },
-    { .x =3D 1280, .y =3D 1024 },
+static const AppleGFXDisplayMode apple_gfx_default_modes[] =3D {
+    { 1920, 1080, 60 },
+    { 1440, 1080, 60 },
+    { 1280, 1024, 60 },
 };
=20
 static Error *apple_gfx_mig_blocker;
@@ -690,22 +691,24 @@ static void new_frame_handler_bh(void *opaque)
     return disp_desc;
 }
=20
-static NSArray<PGDisplayMode*>* apple_gfx_prepare_display_mode_array(void)
+static NSArray<PGDisplayMode *> *apple_gfx_create_display_mode_array(
+    const AppleGFXDisplayMode display_modes[], uint32_t display_mode_count)
 {
-    PGDisplayMode *modes[ARRAY_SIZE(apple_gfx_modes)];
-    NSArray<PGDisplayMode*>* mode_array;
-    int i;
-
-    for (i =3D 0; i < ARRAY_SIZE(apple_gfx_modes); i++) {
-        modes[i] =3D
-            [[PGDisplayMode alloc] initWithSizeInPixels:apple_gfx_modes[i]=
 refreshRateInHz:60.];
-    }
-
-    mode_array =3D [NSArray arrayWithObjects:modes count:ARRAY_SIZE(apple_=
gfx_modes)];
-
-    for (i =3D 0; i < ARRAY_SIZE(apple_gfx_modes); i++) {
-        [modes[i] release];
-        modes[i] =3D nil;
+    uint32_t i;
+    PGDisplayMode *mode_obj;
+    NSMutableArray<PGDisplayMode *> *mode_array =3D
+        [[NSMutableArray alloc] initWithCapacity:display_mode_count];
+
+    for (i =3D 0; i < display_mode_count; i++) {
+        const AppleGFXDisplayMode *mode =3D &display_modes[i];
+        trace_apple_gfx_display_mode(i, mode->width_px, mode->height_px);
+        PGDisplayCoord_t mode_size =3D { mode->width_px, mode->height_px };
+
+        mode_obj =3D
+            [[PGDisplayMode alloc] initWithSizeInPixels:mode_size
+                                        refreshRateInHz:mode->refresh_rate=
_hz];
+        [mode_array addObject:mode_obj];
+        [mode_obj release];
     }
=20
     return mode_array;
@@ -741,6 +744,9 @@ bool apple_gfx_common_realize(AppleGFXState *s, DeviceS=
tate *dev,
                               PGDeviceDescriptor *desc, Error **errp)
 {
     PGDisplayDescriptor *disp_desc;
+    const AppleGFXDisplayMode *display_modes =3D apple_gfx_default_modes;
+    uint32_t num_display_modes =3D ARRAY_SIZE(apple_gfx_default_modes);
+    NSArray<PGDisplayMode *> *mode_array;
=20
     if (apple_gfx_mig_blocker =3D=3D NULL) {
         error_setg(&apple_gfx_mig_blocker,
@@ -776,8 +782,99 @@ bool apple_gfx_common_realize(AppleGFXState *s, Device=
State *dev,
                                               port:0
                                          serialNum:next_pgdisplay_serial_n=
um++];
     [disp_desc release];
-    s->pgdisp.modeList =3D apple_gfx_prepare_display_mode_array();
+
+    if (s->display_modes !=3D NULL && s->num_display_modes > 0) {
+        trace_apple_gfx_common_realize_modes_property(s->num_display_modes=
);
+        display_modes =3D s->display_modes;
+        num_display_modes =3D s->num_display_modes;
+    }
+    s->pgdisp.modeList =3D mode_array =3D
+        apple_gfx_create_display_mode_array(display_modes, num_display_mod=
es);
+    [mode_array release];
=20
     s->con =3D graphic_console_init(dev, 0, &apple_gfx_fb_ops, s);
     return true;
 }
+
+/* ------ Display mode list device property ------ */
+
+static void apple_gfx_get_display_mode(Object *obj, Visitor *v,
+                                       const char *name, void *opaque,
+                                       Error **errp)
+{
+    Property *prop =3D opaque;
+    AppleGFXDisplayMode *mode =3D object_field_prop_ptr(obj, prop);
+    /* 3 uint16s (max 5 digits) + 2 separator characters + nul. */
+    char buffer[5 * 3 + 2 + 1];
+    char *pos =3D buffer;
+
+    int rc =3D snprintf(buffer, sizeof(buffer),
+                      "%"PRIu16"x%"PRIu16"@%"PRIu16,
+                      mode->width_px, mode->height_px,
+                      mode->refresh_rate_hz);
+    assert(rc < sizeof(buffer));
+
+    visit_type_str(v, name, &pos, errp);
+}
+
+static void apple_gfx_set_display_mode(Object *obj, Visitor *v,
+                                       const char *name, void *opaque,
+                                       Error **errp)
+{
+    Property *prop =3D opaque;
+    AppleGFXDisplayMode *mode =3D object_field_prop_ptr(obj, prop);
+    const char *endptr;
+    g_autofree char *str =3D NULL;
+    int ret;
+    int val;
+
+    if (!visit_type_str(v, name, &str, errp)) {
+        return;
+    }
+
+    endptr =3D str;
+
+    ret =3D qemu_strtoi(endptr, &endptr, 10, &val);
+    if (ret || val > UINT16_MAX || val <=3D 0) {
+        error_setg(errp, "width in '%s' must be a decimal integer number "
+                   "of pixels in the range 1..65535", name);
+        return;
+    }
+    mode->width_px =3D val;
+    if (*endptr !=3D 'x') {
+        goto separator_error;
+    }
+
+    ret =3D qemu_strtoi(endptr + 1, &endptr, 10, &val);
+    if (ret || val > UINT16_MAX || val <=3D 0) {
+        error_setg(errp, "height in '%s' must be a decimal integer number "
+                   "of pixels in the range 1..65535", name);
+        return;
+    }
+    mode->height_px =3D val;
+    if (*endptr !=3D '@') {
+        goto separator_error;
+    }
+
+    ret =3D qemu_strtoi(endptr + 1, &endptr, 10, &val);
+    if (ret || val > UINT16_MAX || val <=3D 0) {
+        error_setg(errp, "refresh rate in '%s'"
+                   " must be a positive decimal integer (Hertz)", name);
+        return;
+    }
+    mode->refresh_rate_hz =3D val;
+    return;
+
+separator_error:
+    error_setg(errp, "Each display mode takes the format "
+               "'<width>x<height>@<rate>'");
+}
+
+const PropertyInfo qdev_prop_display_mode =3D {
+    .name  =3D "display_mode",
+    .description =3D
+        "Display mode in pixels and Hertz, as <width>x<height>@<refresh-ra=
te> "
+        "Example: 3840x2160@60",
+    .get   =3D apple_gfx_get_display_mode,
+    .set   =3D apple_gfx_set_display_mode,
+};
diff --git a/hw/display/trace-events b/hw/display/trace-events
index a50e4eea0c0..52786e6e184 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -212,6 +212,8 @@ apple_gfx_cursor_set(uint32_t bpp, uint64_t width, uint=
64_t height) "bpp=3D%d widt
 apple_gfx_cursor_show(uint32_t show) "show=3D%d"
 apple_gfx_cursor_move(void) ""
 apple_gfx_common_init(const char *device_name, size_t mmio_size) "device: =
%s; MMIO size: %zu bytes"
+apple_gfx_common_realize_modes_property(uint32_t num_modes) "using %u mode=
s supplied by 'display-modes' device property"
+apple_gfx_display_mode(uint32_t mode_idx, uint16_t width_px, uint16_t heig=
ht_px) "mode %2"PRIu32": %4"PRIu16"x%4"PRIu16
=20
 # apple-gfx-mmio.m
 apple_gfx_mmio_iosfc_read(uint64_t offset, uint64_t res) "offset=3D0x%"PRI=
x64" res=3D0x%"PRIx64
--=20
2.39.5 (Apple Git-154)