Commit a28c9c8c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging 



vga: ati-vga bugfix, ramfb cleanups and fixes.

# gpg: Signature made Mon 18 May 2020 16:12:11 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20200518-pull-request:
  ramfb: fix size calculation
  ramfb: add sanity checks to ramfb_create_display_surface
  ramfb: don't update RAMFBState on errors
  ramfb: drop leftover debug message
  Revert "hw/display/ramfb: lock guest resolution after it's set"
  Revert "hw/display/ramfb: initialize fw-config space with xres/ yres"
  hw/display: Include local 'framebuffer.h'
  ati-vga: Do not allow unaligned access via index register

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents debe78ce 3fcf15df

hw/display/artist.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "migration/vmstate.h"

#include "ui/console.h"

#include "trace.h"

#include "hw/display/framebuffer.h"

#include "framebuffer.h"



#define TYPE_ARTIST "artist"

#define ARTIST(obj) OBJECT_CHECK(ARTISTState, (obj), TYPE_ARTIST)

hw/display/ati.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, 
    }

    switch (addr) {

    case MM_INDEX:

        s->regs.mm_index = data;

        s->regs.mm_index = data & ~3;

        break;

    case MM_DATA ... MM_DATA + 3:

        /* indexed access to regs or memory */

hw/display/next-fb.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "hw/hw.h"

#include "hw/boards.h"

#include "hw/loader.h"

#include "hw/display/framebuffer.h"

#include "framebuffer.h"

#include "ui/pixel_ops.h"

#include "hw/m68k/next-cube.h"

hw/display/ramfb-standalone.c

+1 −11
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include "qemu/module.h"

#include "hw/loader.h"

#include "hw/qdev-properties.h"

#include "hw/isa/isa.h"

#include "hw/display/ramfb.h"

#include "ui/console.h"
@@ -13,8 +12,6 @@ typedef struct RAMFBStandaloneState { 
    SysBusDevice parent_obj;

    QemuConsole *con;

    RAMFBState *state;

    uint32_t xres;

    uint32_t yres;

} RAMFBStandaloneState;



static void display_update_wrapper(void *dev)
@@ -37,22 +34,15 @@ static void ramfb_realizefn(DeviceState *dev, Error **errp) 
    RAMFBStandaloneState *ramfb = RAMFB(dev);



    ramfb->con = graphic_console_init(dev, 0, &wrapper_ops, dev);

    ramfb->state = ramfb_setup(dev, errp);

    ramfb->state = ramfb_setup(errp);

}



static Property ramfb_properties[] = {

    DEFINE_PROP_UINT32("xres", RAMFBStandaloneState, xres, 0),

    DEFINE_PROP_UINT32("yres", RAMFBStandaloneState, yres, 0),

    DEFINE_PROP_END_OF_LIST(),

};



static void ramfb_class_initfn(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

    dc->realize = ramfb_realizefn;

    device_class_set_props(dc, ramfb_properties);

    dc->desc = "ram framebuffer standalone device";

    dc->user_creatable = true;

}

hw/display/ramfb.c

+30 −49
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 


#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/option.h"

#include "hw/loader.h"

#include "hw/display/ramfb.h"

#include "hw/display/bochs-vbe.h" /* for limits */

#include "ui/console.h"

#include "sysemu/reset.h"
@@ -31,9 +31,7 @@ struct QEMU_PACKED RAMFBCfg { 
struct RAMFBState {

    DisplaySurface *ds;

    uint32_t width, height;

    uint32_t starting_width, starting_height;

    struct RAMFBCfg cfg;

    bool locked;

};



static void ramfb_unmap_display_surface(pixman_image_t *image, void *unused)
@@ -46,25 +44,31 @@ static void ramfb_unmap_display_surface(pixman_image_t *image, void *unused) 


static DisplaySurface *ramfb_create_display_surface(int width, int height,

                                                    pixman_format_code_t format,

                                                    int linesize, uint64_t addr)

                                                    hwaddr stride, hwaddr addr)

{

    DisplaySurface *surface;

    hwaddr size;

    hwaddr size, mapsize, linesize;

    void *data;



    if (linesize == 0) {

    if (width < 16 || width > VBE_DISPI_MAX_XRES ||

        height < 16 || height > VBE_DISPI_MAX_YRES ||

        format == 0 /* unknown format */)

        return NULL;



    linesize = width * PIXMAN_FORMAT_BPP(format) / 8;

    if (stride == 0) {

        stride = linesize;

    }



    size = (hwaddr)linesize * height;

    data = cpu_physical_memory_map(addr, &size, false);

    if (size != (hwaddr)linesize * height) {

        cpu_physical_memory_unmap(data, size, 0, 0);

    mapsize = size = stride * (height - 1) + linesize;

    data = cpu_physical_memory_map(addr, &mapsize, false);

    if (size != mapsize) {

        cpu_physical_memory_unmap(data, mapsize, 0, 0);

        return NULL;

    }



    surface = qemu_create_displaysurface_from(width, height,

                                              format, linesize, data);

                                              format, stride, data);

    pixman_image_set_destroy_function(surface->image,

                                      ramfb_unmap_display_surface, NULL);
@@ -74,6 +78,7 @@ static DisplaySurface *ramfb_create_display_surface(int width, int height, 
static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len)

{

    RAMFBState *s = dev;

    DisplaySurface *surface;

    uint32_t fourcc, format, width, height;

    hwaddr stride, addr;
@@ -84,17 +89,15 @@ static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) 
    addr   = be64_to_cpu(s->cfg.addr);

    format = qemu_drm_format_to_pixman(fourcc);



    fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__,

            width, height, addr);

    if (s->locked) {

        fprintf(stderr, "%s: resolution locked, change rejected\n", __func__);

    surface = ramfb_create_display_surface(width, height,

                                           format, stride, addr);

    if (!surface) {

        return;

    }

    s->locked = true;



    s->width = width;

    s->height = height;

    s->ds = ramfb_create_display_surface(s->width, s->height,

                                         format, stride, addr);

    s->ds = surface;

}



void ramfb_display_update(QemuConsole *con, RAMFBState *s)
@@ -112,16 +115,7 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s) 
    dpy_gfx_update_full(con);

}



static void ramfb_reset(void *opaque)

{

    RAMFBState *s = (RAMFBState *)opaque;

    s->locked = false;

    memset(&s->cfg, 0, sizeof(s->cfg));

    s->cfg.width = s->starting_width;

    s->cfg.height = s->starting_height;

}



RAMFBState *ramfb_setup(DeviceState* dev, Error **errp)

RAMFBState *ramfb_setup(Error **errp)

{

    FWCfgState *fw_cfg = fw_cfg_find();

    RAMFBState *s;
@@ -133,22 +127,9 @@ RAMFBState *ramfb_setup(DeviceState* dev, Error **errp) 


    s = g_new0(RAMFBState, 1);



    const char *s_fb_width = qemu_opt_get(dev->opts, "xres");

    const char *s_fb_height = qemu_opt_get(dev->opts, "yres");

    if (s_fb_width) {

        s->cfg.width = atoi(s_fb_width);

        s->starting_width = s->cfg.width;

    }

    if (s_fb_height) {

        s->cfg.height = atoi(s_fb_height);

        s->starting_height = s->cfg.height;

    }

    s->locked = false;



    rom_add_vga("vgabios-ramfb.bin");

    fw_cfg_add_file_callback(fw_cfg, "etc/ramfb",

                             NULL, ramfb_fw_cfg_write, s,

                             &s->cfg, sizeof(s->cfg), false);

    qemu_register_reset(ramfb_reset, s);

    return s;

}