From nobody Tue Apr 15 14:50:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153510601252488.64297540024222; Fri, 24 Aug 2018 03:20:12 -0700 (PDT) Received: from localhost ([::1]:40902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ft9CJ-0001u6-C6 for importer@patchew.org; Fri, 24 Aug 2018 06:20:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ft8UN-0007gv-CJ for qemu-devel@nongnu.org; Fri, 24 Aug 2018 05:34:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ft8UM-0004pm-1l for qemu-devel@nongnu.org; Fri, 24 Aug 2018 05:34:43 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ft8UL-0004PP-Jm for qemu-devel@nongnu.org; Fri, 24 Aug 2018 05:34:41 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1ft8UJ-0006fj-Ui for qemu-devel@nongnu.org; Fri, 24 Aug 2018 10:34:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 24 Aug 2018 10:33:38 +0100 Message-Id: <20180824093343.11346-48-peter.maydell@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180824093343.11346-1-peter.maydell@linaro.org> References: <20180824093343.11346-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 47/52] hw/display/bcm2835_fb: Reset resolution, etc correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The bcm2835_fb's initial resolution and other parameters are set via QOM properties. We should reset to those initial values on device reset, which means we need to save the QOM property values somewhere that they are not overwritten by guest changes to the framebuffer configuration. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20180814144436.679-5-peter.maydell@linaro.org --- include/hw/display/bcm2835_fb.h | 1 + hw/display/bcm2835_fb.c | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/include/hw/display/bcm2835_fb.h b/include/hw/display/bcm2835_f= b.h index 69cbf2d1fd9..374de546121 100644 --- a/include/hw/display/bcm2835_fb.h +++ b/include/hw/display/bcm2835_fb.h @@ -47,6 +47,7 @@ typedef struct { bool lock, invalidate, pending; =20 BCM2835FBConfig config; + BCM2835FBConfig initial_config; } BCM2835FBState; =20 void bcm2835_fb_reconfigure(BCM2835FBState *s, BCM2835FBConfig *newconfig); diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 9faabf0d0b4..d95686c74c8 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -329,11 +329,7 @@ static void bcm2835_fb_reset(DeviceState *dev) =20 s->pending =3D false; =20 - s->config.xres_virtual =3D s->config.xres; - s->config.yres_virtual =3D s->config.yres; - s->config.xoffset =3D 0; - s->config.yoffset =3D 0; - s->config.base =3D s->vcram_base + BCM2835_FB_OFFSET; + s->config =3D s->initial_config; =20 s->invalidate =3D true; s->lock =3D false; @@ -357,6 +353,13 @@ static void bcm2835_fb_realize(DeviceState *dev, Error= **errp) return; } =20 + /* Fill in the parts of initial_config that are not set by QOM propert= ies */ + s->initial_config.xres_virtual =3D s->initial_config.xres; + s->initial_config.yres_virtual =3D s->initial_config.yres; + s->initial_config.xoffset =3D 0; + s->initial_config.yoffset =3D 0; + s->initial_config.base =3D s->vcram_base + BCM2835_FB_OFFSET; + s->dma_mr =3D MEMORY_REGION(obj); address_space_init(&s->dma_as, s->dma_mr, NULL); =20 @@ -370,13 +373,13 @@ static Property bcm2835_fb_props[] =3D { DEFINE_PROP_UINT32("vcram-base", BCM2835FBState, vcram_base, 0),/*requ= ired*/ DEFINE_PROP_UINT32("vcram-size", BCM2835FBState, vcram_size, DEFAULT_VCRAM_SIZE), - DEFINE_PROP_UINT32("xres", BCM2835FBState, config.xres, 640), - DEFINE_PROP_UINT32("yres", BCM2835FBState, config.yres, 480), - DEFINE_PROP_UINT32("bpp", BCM2835FBState, config.bpp, 16), - DEFINE_PROP_UINT32("pixo", - BCM2835FBState, config.pixo, 1), /* 1=3DRGB, 0=3DBG= R */ - DEFINE_PROP_UINT32("alpha", - BCM2835FBState, config.alpha, 2), /* alpha ignored = */ + DEFINE_PROP_UINT32("xres", BCM2835FBState, initial_config.xres, 640), + DEFINE_PROP_UINT32("yres", BCM2835FBState, initial_config.yres, 480), + DEFINE_PROP_UINT32("bpp", BCM2835FBState, initial_config.bpp, 16), + DEFINE_PROP_UINT32("pixo", BCM2835FBState, + initial_config.pixo, 1), /* 1=3DRGB, 0=3DBGR */ + DEFINE_PROP_UINT32("alpha", BCM2835FBState, + initial_config.alpha, 2), /* alpha ignored */ DEFINE_PROP_END_OF_LIST() }; =20 --=20 2.18.0