mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

framebuffer: drop use of cpu_get_physical_page_desc() 

cpu_get_physical_page_desc() is tied into the memory core's
innards, replace it with uses of the API.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-12-08 16:00:54 +02:00
parent e2177955a8
commit 75c9d6c2f8
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/framebuffer.c
View File

@ -22,6 +22,7 @@
void framebuffer_update_display( void framebuffer_update_display(
DisplayState *ds, DisplayState *ds,
MemoryRegion *address_space,
target_phys_addr_t base, target_phys_addr_t base,
int cols, /* Width in pixels. */ int cols, /* Width in pixels. */
int rows, /* Leight in pixels. */ int rows, /* Leight in pixels. */
@ -42,27 +43,21 @@ void framebuffer_update_display(
int dirty; int dirty;
int i; int i;
ram_addr_t addr; ram_addr_t addr;
ram_addr_t pd; MemoryRegionSection mem_section;
ram_addr_t pd2; MemoryRegion *mem;
i = *first_row; i = *first_row;
*first_row = -1; *first_row = -1;
src_len = src_width * rows; src_len = src_width * rows;
cpu_physical_sync_dirty_bitmap(base, base + src_len); cpu_physical_sync_dirty_bitmap(base, base + src_len);
pd = cpu_get_physical_page_desc(base); mem_section = memory_region_find(address_space, base, src_len);
pd2 = cpu_get_physical_page_desc(base + src_len - 1); if (mem_section.size != src_len || !memory_region_is_ram(mem_section.mr)) {
/* We should reall check that this is a continuous ram region.
Instead we just check that the first and last pages are
both ram, and the right distance apart. */
if ((pd & ~TARGET_PAGE_MASK) > IO_MEM_ROM
|| (pd2 & ~TARGET_PAGE_MASK) > IO_MEM_ROM) {
return;
}
pd = (pd & TARGET_PAGE_MASK) + (base & ~TARGET_PAGE_MASK);
if (((pd + src_len - 1) & TARGET_PAGE_MASK) != (pd2 & TARGET_PAGE_MASK)) {
return; return;
} }
mem = mem_section.mr;
assert(mem);
assert(mem_section.offset_within_address_space == base);
src_base = cpu_physical_memory_map(base, &src_len, 0); src_base = cpu_physical_memory_map(base, &src_len, 0);
/* If we can't map the framebuffer then bail. We could try harder, /* If we can't map the framebuffer then bail. We could try harder,
@ -82,7 +77,7 @@ void framebuffer_update_display(
dest -= dest_row_pitch * (rows - 1); dest -= dest_row_pitch * (rows - 1);
} }
first = -1; first = -1;
addr = pd; addr = mem_section.offset_within_region;
addr += i * src_width; addr += i * src_width;
src += i * src_width; src += i * src_width;
@ -93,8 +88,8 @@ void framebuffer_update_display(
dirty = 0; dirty = 0;
dirty_offset = 0; dirty_offset = 0;
while (addr + dirty_offset < TARGET_PAGE_ALIGN(addr + src_width)) { while (addr + dirty_offset < TARGET_PAGE_ALIGN(addr + src_width)) {
dirty |= cpu_physical_memory_get_dirty(addr + dirty_offset, dirty |= memory_region_get_dirty(mem, addr + dirty_offset,
VGA_DIRTY_FLAG); DIRTY_MEMORY_VGA);
dirty_offset += TARGET_PAGE_SIZE; dirty_offset += TARGET_PAGE_SIZE;
} }
@ -112,7 +107,8 @@ void framebuffer_update_display(
if (first < 0) { if (first < 0) {
return; return;
} }
cpu_physical_memory_reset_dirty(pd, pd + src_len, VGA_DIRTY_FLAG); memory_region_reset_dirty(mem, mem_section.offset_within_region, src_len,
DIRTY_MEMORY_VGA);
*first_row = first; *first_row = first;
*last_row = last; *last_row = last;
return; return;

3
hw/framebuffer.h
View File

@ -1,12 +1,15 @@
#ifndef QEMU_FRAMEBUFFER_H #ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H #define QEMU_FRAMEBUFFER_H
#include "memory.h"
/* Framebuffer device helper routines. */ /* Framebuffer device helper routines. */
typedef void (*drawfn)(void *, uint8_t *, const uint8_t *, int, int); typedef void (*drawfn)(void *, uint8_t *, const uint8_t *, int, int);
void framebuffer_update_display( void framebuffer_update_display(
DisplayState *ds, DisplayState *ds,
MemoryRegion *address_space,
target_phys_addr_t base, target_phys_addr_t base,
int cols, int cols,
int rows, int rows,

2
hw/milkymist-vgafb.c
View File

@ -120,7 +120,7 @@ static void vgafb_update_display(void *opaque)
break; break;
} }
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, sysbus_address_space(&s->busdev),
s->regs[R_BASEADDRESS] + s->fb_offset, s->regs[R_BASEADDRESS] + s->fb_offset,
s->regs[R_HRES], s->regs[R_HRES],
s->regs[R_VRES], s->regs[R_VRES],

4
hw/omap_lcdc.c
View File

@ -22,6 +22,7 @@
#include "framebuffer.h" #include "framebuffer.h"
struct omap_lcd_panel_s { struct omap_lcd_panel_s {
MemoryRegion *sysmem;
MemoryRegion iomem; MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
DisplayState *state; DisplayState *state;
@ -211,7 +212,7 @@ static void omap_update_display(void *opaque)
step = width * bpp >> 3; step = width * bpp >> 3;
linesize = ds_get_linesize(omap_lcd->state); linesize = ds_get_linesize(omap_lcd->state);
framebuffer_update_display(omap_lcd->state, framebuffer_update_display(omap_lcd->state, omap_lcd->sysmem,
frame_base, width, height, frame_base, width, height,
step, linesize, 0, step, linesize, 0,
omap_lcd->invalidate, omap_lcd->invalidate,
@ -440,6 +441,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,
s->irq = irq; s->irq = irq;
s->dma = dma; s->dma = dma;
s->sysmem = sysmem;
omap_lcdc_reset(s); omap_lcdc_reset(s);
memory_region_init_io(&s->iomem, &omap_lcdc_ops, s, "omap.lcdc", 0x100); memory_region_init_io(&s->iomem, &omap_lcdc_ops, s, "omap.lcdc", 0x100);

2
hw/pl110.c
View File

@ -229,7 +229,7 @@ static void pl110_update_display(void *opaque)
} }
dest_width *= s->cols; dest_width *= s->cols;
first = 0; first = 0;
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, sysbus_address_space(&s->busdev),
s->upbase, s->cols, s->rows, s->upbase, s->cols, s->rows,
src_width, dest_width, 0, src_width, dest_width, 0,
s->invalidate, s->invalidate,

10
hw/pxa2xx_lcd.c
View File

@ -30,6 +30,7 @@ struct DMAChannel {
}; };
struct PXA2xxLCDState { struct PXA2xxLCDState {
MemoryRegion *sysmem;
MemoryRegion iomem; MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
int irqlevel; int irqlevel;
@ -681,7 +682,7 @@ static void pxa2xx_lcdc_dma0_redraw_rot0(PXA2xxLCDState *s,
dest_width = s->xres * s->dest_width; dest_width = s->xres * s->dest_width;
*miny = 0; *miny = 0;
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, s->sysmem,
addr, s->xres, s->yres, addr, s->xres, s->yres,
src_width, dest_width, s->dest_width, src_width, dest_width, s->dest_width,
s->invalidated, s->invalidated,
@ -708,7 +709,7 @@ static void pxa2xx_lcdc_dma0_redraw_rot90(PXA2xxLCDState *s,
dest_width = s->yres * s->dest_width; dest_width = s->yres * s->dest_width;
*miny = 0; *miny = 0;
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, s->sysmem,
addr, s->xres, s->yres, addr, s->xres, s->yres,
src_width, s->dest_width, -dest_width, src_width, s->dest_width, -dest_width,
s->invalidated, s->invalidated,
@ -739,7 +740,7 @@ static void pxa2xx_lcdc_dma0_redraw_rot180(PXA2xxLCDState *s,
dest_width = s->xres * s->dest_width; dest_width = s->xres * s->dest_width;
*miny = 0; *miny = 0;
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, s->sysmem,
addr, s->xres, s->yres, addr, s->xres, s->yres,
src_width, -dest_width, -s->dest_width, src_width, -dest_width, -s->dest_width,
s->invalidated, s->invalidated,
@ -769,7 +770,7 @@ static void pxa2xx_lcdc_dma0_redraw_rot270(PXA2xxLCDState *s,
dest_width = s->yres * s->dest_width; dest_width = s->yres * s->dest_width;
*miny = 0; *miny = 0;
framebuffer_update_display(s->ds, framebuffer_update_display(s->ds, s->sysmem,
addr, s->xres, s->yres, addr, s->xres, s->yres,
src_width, -s->dest_width, dest_width, src_width, -s->dest_width, dest_width,
s->invalidated, s->invalidated,
@ -985,6 +986,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem,
s = (PXA2xxLCDState *) g_malloc0(sizeof(PXA2xxLCDState)); s = (PXA2xxLCDState *) g_malloc0(sizeof(PXA2xxLCDState));
s->invalidated = 1; s->invalidated = 1;
s->irq = irq; s->irq = irq;
s->sysmem = sysmem;
pxa2xx_lcdc_orientation(s, graphic_rotate); pxa2xx_lcdc_orientation(s, graphic_rotate);