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

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



ramfb: misc improvements.

# gpg: Signature made Fri 24 May 2019 09:56:59 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-20190524-pull-request:
  hw/display/ramfb: initialize fw-config space with xres/ yres
  hw/display/ramfb: lock guest resolution after it's set
  hw/display/ramfb: fix guest memory un-mapping

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 63601125 f79081b4

hw/display/ramfb-standalone.c

+11 −1
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/loader.h"

#include "hw/isa/isa.h"

#include "hw/display/ramfb.h"

#include "ui/console.h"

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

    QemuConsole *con;

    RAMFBState *state;

    uint32_t xres;

    uint32_t yres;

} RAMFBStandaloneState;



static void display_update_wrapper(void *dev)
@@ -33,15 +36,22 @@ 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(errp);

    ramfb->state = ramfb_setup(dev, 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;

    dc->props = ramfb_properties;

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

    dc->user_creatable = true;

}

hw/display/ramfb.c

+73 −16
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/option.h"

#include "hw/loader.h"

#include "hw/display/ramfb.h"

#include "ui/console.h"
@@ -29,36 +30,70 @@ 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)

{

    void *data = pixman_image_get_data(image);

    uint32_t size = pixman_image_get_stride(image) *

        pixman_image_get_height(image);

    cpu_physical_memory_unmap(data, size, 0, 0);

}



static DisplaySurface *ramfb_create_display_surface(int width, int height,

                                                    pixman_format_code_t format,

                                                    int linesize, uint64_t addr)

{

    DisplaySurface *surface;

    hwaddr size;

    void *data;



    if (linesize == 0) {

        linesize = width * PIXMAN_FORMAT_BPP(format) / 8;

    }



    size = (hwaddr)linesize * height;

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

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

        cpu_physical_memory_unmap(data, size, 0, 0);

        return NULL;

    }



    surface = qemu_create_displaysurface_from(width, height,

                                              format, linesize, data);

    pixman_image_set_destroy_function(surface->image,

                                      ramfb_unmap_display_surface, NULL);



    return surface;

}



static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len)

{

    RAMFBState *s = dev;

    void *framebuffer;

    uint32_t fourcc, format;

    hwaddr stride, addr, length;

    uint32_t fourcc, format, width, height;

    hwaddr stride, addr;



    s->width  = be32_to_cpu(s->cfg.width);

    s->height = be32_to_cpu(s->cfg.height);

    width     = be32_to_cpu(s->cfg.width);

    height    = be32_to_cpu(s->cfg.height);

    stride    = be32_to_cpu(s->cfg.stride);

    fourcc    = be32_to_cpu(s->cfg.fourcc);

    addr      = be64_to_cpu(s->cfg.addr);

    length    = stride * s->height;

    format    = qemu_drm_format_to_pixman(fourcc);



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

            s->width, s->height, addr);

    framebuffer = address_space_map(&address_space_memory,

                                    addr, &length, false,

                                    MEMTXATTRS_UNSPECIFIED);

    if (!framebuffer || length < stride * s->height) {

        s->width = 0;

        s->height = 0;

            width, height, addr);

    if (s->locked) {

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

        return;

    }

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

                                            format, stride, framebuffer);

    s->locked = true;

    s->width = width;

    s->height = height;

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

                                         format, stride, addr);

}



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

}



RAMFBState *ramfb_setup(Error **errp)

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)

{

    FWCfgState *fw_cfg = fw_cfg_find();

    RAMFBState *s;
@@ -88,9 +132,22 @@ RAMFBState *ramfb_setup(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;

}

hw/vfio/display.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) 
                                          &vfio_display_dmabuf_ops,

                                          vdev);

    if (vdev->enable_ramfb) {

        vdev->dpy->ramfb = ramfb_setup(errp);

        vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp);

    }

    vfio_display_edid_init(vdev);

    return 0;
@@ -478,7 +478,7 @@ static int vfio_display_region_init(VFIOPCIDevice *vdev, Error **errp) 
                                          &vfio_display_region_ops,

                                          vdev);

    if (vdev->enable_ramfb) {

        vdev->dpy->ramfb = ramfb_setup(errp);

        vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp);

    }

    return 0;

}

include/hw/display/ramfb.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
/* ramfb.c */

typedef struct RAMFBState RAMFBState;

void ramfb_display_update(QemuConsole *con, RAMFBState *s);

RAMFBState *ramfb_setup(Error **errp);

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



/* ramfb-standalone.c */

#define TYPE_RAMFB_DEVICE "ramfb"

stubs/ramfb.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s) 
{

}



RAMFBState *ramfb_setup(Error **errp)

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

{

    error_setg(errp, "ramfb support not available");

    return NULL;