ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/display/bcm2835_fb: Drop unused size and pitch fields 

The BCM2835FBState struct has a 'pitch' field which is a
cached copy of xres * (bpp >> 3), and a 'size' field which is
a cached copy of pitch * yres. However we don't actually do
anything with these fields; delete them. We retain the
now-unused slots in the VMState struct for migration
compatibility.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180814144436.679-4-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-08-24 13:17:49 +01:00
parent 193100b571
commit ea662f7cc8
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/display/bcm2835_fb.c
View File

@ -184,6 +184,9 @@ static void fb_update_display(void *opaque)
static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value) static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value)
{ {
uint32_t pitch;
uint32_t size;
value &= ~0xf; value &= ~0xf;
s->lock = true; s->lock = true;
@ -201,12 +204,12 @@ static void bcm2835_fb_mbox_push(BCM2835FBState *s, uint32_t value)
/* TODO - Manage properly virtual resolution */ /* TODO - Manage properly virtual resolution */
s->pitch = s->config.xres * (s->config.bpp >> 3); pitch = s->config.xres * (s->config.bpp >> 3);
s->size = s->config.yres * s->pitch; size = s->config.yres * pitch;
stl_le_phys(&s->dma_as, value + 16, s->pitch); 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 + 32, s->config.base);
stl_le_phys(&s->dma_as, value + 36, s->size); stl_le_phys(&s->dma_as, value + 36, size);
s->invalidate = true; s->invalidate = true;
qemu_console_resize(s->con, s->config.xres, s->config.yres); qemu_console_resize(s->con, s->config.xres, s->config.yres);
@ -223,9 +226,6 @@ void bcm2835_fb_reconfigure(BCM2835FBState *s, BCM2835FBConfig *newconfig)
/* TODO - Manage properly virtual resolution */ /* TODO - Manage properly virtual resolution */
s->pitch = s->config.xres * (s->config.bpp >> 3);
s->size = s->config.yres * s->pitch;
s->invalidate = true; s->invalidate = true;
qemu_console_resize(s->con, s->config.xres, s->config.yres); qemu_console_resize(s->con, s->config.xres, s->config.yres);
s->lock = false; s->lock = false;
@ -301,8 +301,7 @@ static const VMStateDescription vmstate_bcm2835_fb = {
VMSTATE_UINT32(config.yoffset, BCM2835FBState), VMSTATE_UINT32(config.yoffset, BCM2835FBState),
VMSTATE_UINT32(config.bpp, BCM2835FBState), VMSTATE_UINT32(config.bpp, BCM2835FBState),
VMSTATE_UINT32(config.base, BCM2835FBState), VMSTATE_UINT32(config.base, BCM2835FBState),
VMSTATE_UINT32(pitch, BCM2835FBState), VMSTATE_UNUSED(8), /* Was pitch and size */
VMSTATE_UINT32(size, BCM2835FBState),
VMSTATE_UINT32(config.pixo, BCM2835FBState), VMSTATE_UINT32(config.pixo, BCM2835FBState),
VMSTATE_UINT32(config.alpha, BCM2835FBState), VMSTATE_UINT32(config.alpha, BCM2835FBState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
@ -335,8 +334,6 @@ static void bcm2835_fb_reset(DeviceState *dev)
s->config.xoffset = 0; s->config.xoffset = 0;
s->config.yoffset = 0; s->config.yoffset = 0;
s->config.base = s->vcram_base + BCM2835_FB_OFFSET; s->config.base = s->vcram_base + BCM2835_FB_OFFSET;
s->pitch = s->config.xres * (s->config.bpp >> 3);
s->size = s->config.yres * s->pitch;
s->invalidate = true; s->invalidate = true;
s->lock = false; s->lock = false;

4
include/hw/display/bcm2835_fb.h
View File

@ -47,10 +47,6 @@ typedef struct {
bool lock, invalidate, pending; bool lock, invalidate, pending;
BCM2835FBConfig config; BCM2835FBConfig config;
/* These are just cached values calculated from the config settings */
uint32_t size;
uint32_t pitch;
} BCM2835FBState; } BCM2835FBState;
void bcm2835_fb_reconfigure(BCM2835FBState *s, BCM2835FBConfig *newconfig); void bcm2835_fb_reconfigure(BCM2835FBState *s, BCM2835FBConfig *newconfig);