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

hw/display/pxa2xx_lcd: Remove dest_width state field 

Since the dest_width is now always 4 because the output surface is
32bpp, we can replace the dest_width state field with a constant.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210211141515.8755-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-11 14:15:11 +00:00
parent e834dfc64c
commit 9e53ecdc20
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/display/pxa2xx_lcd.c
View File

@ -187,6 +187,9 @@ typedef struct QEMU_PACKED {
#define LDCMD_SOFINT (1 << 22) #define LDCMD_SOFINT (1 << 22)
#define LDCMD_PAL (1 << 26) #define LDCMD_PAL (1 << 26)
/* Size of a pixel in the QEMU UI output surface, in bytes */
#define DEST_PIXEL_WIDTH 4
#define BITS 32 #define BITS 32
#include "pxa2xx_template.h" #include "pxa2xx_template.h"
@ -702,14 +705,14 @@ static void pxa2xx_lcdc_dma0_redraw_rot0(PXA2xxLCDState *s,
else if (s->bpp > pxa_lcdc_8bpp) else if (s->bpp > pxa_lcdc_8bpp)
src_width *= 2; src_width *= 2;
dest_width = s->xres * s->dest_width; dest_width = s->xres * DEST_PIXEL_WIDTH;
*miny = 0; *miny = 0;
if (s->invalidated) { if (s->invalidated) {
framebuffer_update_memory_section(&s->fbsection, s->sysmem, framebuffer_update_memory_section(&s->fbsection, s->sysmem,
addr, s->yres, src_width); addr, s->yres, src_width);
} }
framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres, framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres,
src_width, dest_width, s->dest_width, src_width, dest_width, DEST_PIXEL_WIDTH,
s->invalidated, s->invalidated,
fn, s->dma_ch[0].palette, miny, maxy); fn, s->dma_ch[0].palette, miny, maxy);
} }
@ -731,14 +734,14 @@ static void pxa2xx_lcdc_dma0_redraw_rot90(PXA2xxLCDState *s,
else if (s->bpp > pxa_lcdc_8bpp) else if (s->bpp > pxa_lcdc_8bpp)
src_width *= 2; src_width *= 2;
dest_width = s->yres * s->dest_width; dest_width = s->yres * DEST_PIXEL_WIDTH;
*miny = 0; *miny = 0;
if (s->invalidated) { if (s->invalidated) {
framebuffer_update_memory_section(&s->fbsection, s->sysmem, framebuffer_update_memory_section(&s->fbsection, s->sysmem,
addr, s->yres, src_width); addr, s->yres, src_width);
} }
framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres, framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres,
src_width, s->dest_width, -dest_width, src_width, DEST_PIXEL_WIDTH, -dest_width,
s->invalidated, s->invalidated,
fn, s->dma_ch[0].palette, fn, s->dma_ch[0].palette,
miny, maxy); miny, maxy);
@ -763,14 +766,14 @@ static void pxa2xx_lcdc_dma0_redraw_rot180(PXA2xxLCDState *s,
src_width *= 2; src_width *= 2;
} }
dest_width = s->xres * s->dest_width; dest_width = s->xres * DEST_PIXEL_WIDTH;
*miny = 0; *miny = 0;
if (s->invalidated) { if (s->invalidated) {
framebuffer_update_memory_section(&s->fbsection, s->sysmem, framebuffer_update_memory_section(&s->fbsection, s->sysmem,
addr, s->yres, src_width); addr, s->yres, src_width);
} }
framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres, framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres,
src_width, -dest_width, -s->dest_width, src_width, -dest_width, -DEST_PIXEL_WIDTH,
s->invalidated, s->invalidated,
fn, s->dma_ch[0].palette, miny, maxy); fn, s->dma_ch[0].palette, miny, maxy);
} }
@ -794,14 +797,14 @@ static void pxa2xx_lcdc_dma0_redraw_rot270(PXA2xxLCDState *s,
src_width *= 2; src_width *= 2;
} }
dest_width = s->yres * s->dest_width; dest_width = s->yres * DEST_PIXEL_WIDTH;
*miny = 0; *miny = 0;
if (s->invalidated) { if (s->invalidated) {
framebuffer_update_memory_section(&s->fbsection, s->sysmem, framebuffer_update_memory_section(&s->fbsection, s->sysmem,
addr, s->yres, src_width); addr, s->yres, src_width);
} }
framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres, framebuffer_update_display(surface, &s->fbsection, s->xres, s->yres,
src_width, -s->dest_width, dest_width, src_width, -DEST_PIXEL_WIDTH, dest_width,
s->invalidated, s->invalidated,
fn, s->dma_ch[0].palette, fn, s->dma_ch[0].palette,
miny, maxy); miny, maxy);
@ -1013,7 +1016,6 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem,
memory_region_add_subregion(sysmem, base, &s->iomem); memory_region_add_subregion(sysmem, base, &s->iomem);
s->con = graphic_console_init(NULL, 0, &pxa2xx_ops, s); s->con = graphic_console_init(NULL, 0, &pxa2xx_ops, s);
s->dest_width = 4;
vmstate_register(NULL, 0, &vmstate_pxa2xx_lcdc, s); vmstate_register(NULL, 0, &vmstate_pxa2xx_lcdc, s);