[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 51/52] hw/display/bcm2835_fb: Validate bcm2835_fb_mbo
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 51/52] hw/display/bcm2835_fb: Validate bcm2835_fb_mbox_push() config |
Date: |
Fri, 24 Aug 2018 10:33:42 +0100 |
Refactor bcm2835_fb_mbox_push() to work by calling
bcm2835_fb_validate_config() and bcm2835_fb_reconfigure(),
so that config set this way is also validated.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
---
hw/display/bcm2835_fb.c | 63 ++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 32 deletions(-)
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 3edb8b5cfcb..d534d00a65f 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -248,38 +248,6 @@ void bcm2835_fb_validate_config(BCM2835FBConfig *config)
}
}
-static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value)
-{
- uint32_t pitch;
- uint32_t size;
-
- value &= ~0xf;
-
- s->lock = true;
-
- s->config.xres = ldl_le_phys(&s->dma_as, value);
- s->config.yres = ldl_le_phys(&s->dma_as, value + 4);
- s->config.xres_virtual = ldl_le_phys(&s->dma_as, value + 8);
- s->config.yres_virtual = ldl_le_phys(&s->dma_as, value + 12);
- s->config.bpp = ldl_le_phys(&s->dma_as, value + 20);
- s->config.xoffset = ldl_le_phys(&s->dma_as, value + 24);
- s->config.yoffset = ldl_le_phys(&s->dma_as, value + 28);
-
- s->config.base = s->vcram_base | (value & 0xc0000000);
- s->config.base += BCM2835_FB_OFFSET;
-
- pitch = bcm2835_fb_get_pitch(&s->config);
- size = bcm2835_fb_get_size(&s->config);
-
- stl_le_phys(&s->dma_as, value + 16, pitch);
- stl_le_phys(&s->dma_as, value + 32, s->config.base);
- stl_le_phys(&s->dma_as, value + 36, size);
-
- s->invalidate = true;
- qemu_console_resize(s->con, s->config.xres, s->config.yres);
- s->lock = false;
-}
-
void bcm2835_fb_reconfigure(BCM2835FBState *s, BCM2835FBConfig *newconfig)
{
s->lock = true;
@@ -291,6 +259,37 @@ void bcm2835_fb_reconfigure(BCM2835FBState *s,
BCM2835FBConfig *newconfig)
s->lock = false;
}
+static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value)
+{
+ uint32_t pitch;
+ uint32_t size;
+ BCM2835FBConfig newconf;
+
+ value &= ~0xf;
+
+ newconf.xres = ldl_le_phys(&s->dma_as, value);
+ newconf.yres = ldl_le_phys(&s->dma_as, value + 4);
+ newconf.xres_virtual = ldl_le_phys(&s->dma_as, value + 8);
+ newconf.yres_virtual = ldl_le_phys(&s->dma_as, value + 12);
+ newconf.bpp = ldl_le_phys(&s->dma_as, value + 20);
+ newconf.xoffset = ldl_le_phys(&s->dma_as, value + 24);
+ newconf.yoffset = ldl_le_phys(&s->dma_as, value + 28);
+
+ newconf.base = s->vcram_base | (value & 0xc0000000);
+ newconf.base += BCM2835_FB_OFFSET;
+
+ bcm2835_fb_validate_config(&newconf);
+
+ pitch = bcm2835_fb_get_pitch(&newconf);
+ size = bcm2835_fb_get_size(&newconf);
+
+ stl_le_phys(&s->dma_as, value + 16, pitch);
+ stl_le_phys(&s->dma_as, value + 32, newconf.base);
+ stl_le_phys(&s->dma_as, value + 36, size);
+
+ bcm2835_fb_reconfigure(s, &newconf);
+}
+
static uint64_t bcm2835_fb_read(void *opaque, hwaddr offset, unsigned size)
{
BCM2835FBState *s = opaque;
--
2.18.0
- [Qemu-devel] [PULL 39/52] hw/arm/mps2-tz: Instantiate SPI controllers, (continued)
- [Qemu-devel] [PULL 39/52] hw/arm/mps2-tz: Instantiate SPI controllers, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 43/52] target/arm: Remove a handful of stray tabs, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 40/52] hw/arm/mps2-tz: Fix MPS2 SCC config register values, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 42/52] target/arm: Untabify iwmmxt_helper.c, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 36/52] hw/ssi/pl022: Use DeviceState::realize rather than SysBusDevice::init, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 34/52] hw/ssi/pl022: Set up reset function in class init, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 47/52] hw/display/bcm2835_fb: Reset resolution, etc correctly, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 46/52] hw/display/bcm2835_fb: Drop unused size and pitch fields, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 49/52] hw/display/bcm2835_fb: Fix handling of virtual framebuffer, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 44/52] hw/misc/bcm2835_fb: Move config fields to their own struct, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 51/52] hw/display/bcm2835_fb: Validate bcm2835_fb_mbox_push() config,
Peter Maydell <=
- [Qemu-devel] [PULL 35/52] hw/ssi/pl022: Don't directly call vmstate_register(), Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 41/52] target/arm: Untabify translate.c, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 45/52] hw/misc/bcm2835_property: Track fb settings using BCM2835FBConfig, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 48/52] hw/display/bcm2835_fb: Abstract out calculation of pitch, size, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 52/52] hw/arm/mps2: Fix ID register errors on AN511 and AN385, Peter Maydell, 2018/08/24
- [Qemu-devel] [PULL 50/52] hw/display/bcm2835_fb: Validate config settings, Peter Maydell, 2018/08/24