Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20170111-1' into staging

[qemu.git] / hw / display / pl110.c

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index ab689e9aae69d469d80092821d944c480ddc9687..8c7dcc6f0a69ea35fdaabd161f02e9220e90e4ea 100644 (file)
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -7,10 +7,12 @@
  * This code is licensed under the GNU LGPL
  */
 
  * This code is licensed under the GNU LGPL
  */
 

+#include "qemu/osdep.h"

 #include "hw/sysbus.h"
 #include "ui/console.h"
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "hw/sysbus.h"
 #include "ui/console.h"
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"

+#include "qemu/log.h"

 
 #define PL110_CR_EN   0x001
 #define PL110_CR_BGR  0x100
 
 #define PL110_CR_EN   0x001
 #define PL110_CR_BGR  0x100


@@ -46,6 +48,7 @@ typedef struct PL110State {
     SysBusDevice parent_obj;
 
     MemoryRegion iomem;
     SysBusDevice parent_obj;
 
     MemoryRegion iomem;

+    MemoryRegionSection fbsection;

     QemuConsole *con;
 
     int version;
     QemuConsole *con;
 
     int version;


@@ -238,12 +241,20 @@ static void pl110_update_display(void *opaque)
     }
     dest_width *= s->cols;
     first = 0;
     }
     dest_width *= s->cols;
     first = 0;

-    framebuffer_update_display(surface, sysbus_address_space(sbd),
-                               s->upbase, s->cols, s->rows,
+    if (s->invalidate) {
+        framebuffer_update_memory_section(&s->fbsection,
+                                          sysbus_address_space(sbd),
+                                          s->upbase,
+                                          s->rows, src_width);
+    }
+
+    framebuffer_update_display(surface, &s->fbsection,
+                               s->cols, s->rows,

                                src_width, dest_width, 0,
                                s->invalidate,
                                fn, s->palette,
                                &first, &last);
                                src_width, dest_width, 0,
                                s->invalidate,
                                fn, s->palette,
                                &first, &last);

+

     if (first >= 0) {
         dpy_gfx_update(s->con, 0, first, s->cols, last - first + 1);
     }
     if (first >= 0) {
         dpy_gfx_update(s->con, 0, first, s->cols, last - first + 1);
     }


@@ -455,17 +466,16 @@ static const GraphicHwOps pl110_gfx_ops = {
     .gfx_update  = pl110_update_display,
 };
 
     .gfx_update  = pl110_update_display,
 };
 

-static int pl110_initfn(SysBusDevice *sbd)
+static void pl110_realize(DeviceState *dev, Error **errp)

 {
 {

-    DeviceState *dev = DEVICE(sbd);

     PL110State *s = PL110(dev);
     PL110State *s = PL110(dev);

+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

 
     memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
     sysbus_init_mmio(sbd, &s->iomem);
     sysbus_init_irq(sbd, &s->irq);
     qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);
 
     memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
     sysbus_init_mmio(sbd, &s->iomem);
     sysbus_init_irq(sbd, &s->irq);
     qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);

-    s->con = graphic_console_init(dev, &pl110_gfx_ops, s);
-    return 0;
+    s->con = graphic_console_init(dev, 0, &pl110_gfx_ops, s);

 }
 
 static void pl110_init(Object *obj)
 }
 
 static void pl110_init(Object *obj)


@@ -492,11 +502,10 @@ static void pl111_init(Object *obj)
 static void pl110_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 static void pl110_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);

-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

 
 

-    k->init = pl110_initfn;

     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
     dc->vmsd = &vmstate_pl110;
     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
     dc->vmsd = &vmstate_pl110;

+    dc->realize = pl110_realize;

 }
 
 static const TypeInfo pl110_info = {
 }
 
 static const TypeInfo pl110_info = {