OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/display/exynos4210_fimd: Pass frame buffer memory region as link

Browse Source 
Add the Exynos4210fimdState::'framebuffer-memory' property. Have
the board set it. We don't need to call sysbus_address_space()
anymore.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240226173805.289-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-09-22 19:00:32 +02:00
parent 1cfe461428
commit 6d73fff3ef
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/exynos4210.c
View File

@ -770,6 +770,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)
/*** Display controller (FIMD) ***/ /*** Display controller (FIMD) ***/
dev = qdev_new("exynos4210.fimd"); dev = qdev_new("exynos4210.fimd");
object_property_set_link(OBJECT(dev), "framebuffer-memory",
OBJECT(system_mem), &error_fatal);
busdev = SYS_BUS_DEVICE(dev); busdev = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(busdev, &error_fatal); sysbus_realize_and_unref(busdev, &error_fatal);
sysbus_mmio_map(busdev, 0, EXYNOS4210_FIMD0_BASE_ADDR); sysbus_mmio_map(busdev, 0, EXYNOS4210_FIMD0_BASE_ADDR);

19
hw/display/exynos4210_fimd.c
View File

@ -23,6 +23,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/qdev-properties.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -32,6 +33,7 @@
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qapi/error.h"
#include "qom/object.h" #include "qom/object.h"
/* Debug messages configuration */ /* Debug messages configuration */
@ -302,6 +304,7 @@ struct Exynos4210fimdState {
MemoryRegion iomem; MemoryRegion iomem;
QemuConsole *console; QemuConsole *console;
qemu_irq irq[3]; qemu_irq irq[3];
MemoryRegion *fbmem;
uint32_t vidcon[4]; /* Video main control registers 0-3 */ uint32_t vidcon[4]; /* Video main control registers 0-3 */
uint32_t vidtcon[4]; /* Video time control registers 0-3 */ uint32_t vidtcon[4]; /* Video time control registers 0-3 */
@ -1119,7 +1122,6 @@ static void exynos4210_fimd_invalidate(void *opaque)
* VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */ * VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */
static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win) static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(s);
Exynos4210fimdWindow *w = &s->window[win]; Exynos4210fimdWindow *w = &s->window[win];
hwaddr fb_start_addr, fb_mapped_len; hwaddr fb_start_addr, fb_mapped_len;
@ -1147,8 +1149,7 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)
memory_region_unref(w->mem_section.mr); memory_region_unref(w->mem_section.mr);
} }
w->mem_section = memory_region_find(sysbus_address_space(sbd), w->mem_section = memory_region_find(s->fbmem, fb_start_addr, w->fb_len);
fb_start_addr, w->fb_len);
assert(w->mem_section.mr); assert(w->mem_section.mr);
assert(w->mem_section.offset_within_address_space == fb_start_addr); assert(w->mem_section.offset_within_address_space == fb_start_addr);
DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n", DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n",
@ -1924,6 +1925,12 @@ static const GraphicHwOps exynos4210_fimd_ops = {
.gfx_update = exynos4210_fimd_update, .gfx_update = exynos4210_fimd_update,
}; };
static Property exynos4210_fimd_properties[] = {
DEFINE_PROP_LINK("framebuffer-memory", Exynos4210fimdState, fbmem,
TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_PROP_END_OF_LIST(),
};
static void exynos4210_fimd_init(Object *obj) static void exynos4210_fimd_init(Object *obj)
{ {
Exynos4210fimdState *s = EXYNOS4210_FIMD(obj); Exynos4210fimdState *s = EXYNOS4210_FIMD(obj);
@ -1944,6 +1951,11 @@ static void exynos4210_fimd_realize(DeviceState *dev, Error **errp)
{ {
Exynos4210fimdState *s = EXYNOS4210_FIMD(dev); Exynos4210fimdState *s = EXYNOS4210_FIMD(dev);
if (!s->fbmem) {
error_setg(errp, "'framebuffer-memory' property was not set");
return;
}
s->console = graphic_console_init(dev, 0, &exynos4210_fimd_ops, s); s->console = graphic_console_init(dev, 0, &exynos4210_fimd_ops, s);
} }
@ -1954,6 +1966,7 @@ static void exynos4210_fimd_class_init(ObjectClass *klass, void *data)
dc->vmsd = &exynos4210_fimd_vmstate; dc->vmsd = &exynos4210_fimd_vmstate;
dc->reset = exynos4210_fimd_reset; dc->reset = exynos4210_fimd_reset;
dc->realize = exynos4210_fimd_realize; dc->realize = exynos4210_fimd_realize;
device_class_set_props(dc, exynos4210_fimd_properties);
} }
static const TypeInfo exynos4210_fimd_info = { static const TypeInfo exynos4210_fimd_info = {