hw/display/ramfb: initialize fw-config space with xres/ yres

If xres / yres were specified in QEMU command line, write them as an initial
resolution to the fw-config space on guest reset, which a later BIOS / OVMF
patch can take advantage of.

Signed-off-by: HOU Qiming <hqm03ster@gmail.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Message-id: 20190513115731.17588-4-marcel.apfelbaum@gmail.com
[fixed malformed patch]
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hou Qiming 2019-05-13 14:57:31 +03:00 committed by Gerd Hoffmann
parent a9e0cb67b7
commit f79081b4b7
5 changed files with 30 additions and 6 deletions

View File

@ -1,6 +1,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/isa/isa.h"
#include "hw/display/ramfb.h" #include "hw/display/ramfb.h"
#include "ui/console.h" #include "ui/console.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@ -11,6 +12,8 @@ typedef struct RAMFBStandaloneState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
QemuConsole *con; QemuConsole *con;
RAMFBState *state; RAMFBState *state;
uint32_t xres;
uint32_t yres;
} RAMFBStandaloneState; } RAMFBStandaloneState;
static void display_update_wrapper(void *dev) static void display_update_wrapper(void *dev)
@ -33,15 +36,22 @@ static void ramfb_realizefn(DeviceState *dev, Error **errp)
RAMFBStandaloneState *ramfb = RAMFB(dev); RAMFBStandaloneState *ramfb = RAMFB(dev);
ramfb->con = graphic_console_init(dev, 0, &wrapper_ops, 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) static void ramfb_class_initfn(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
dc->realize = ramfb_realizefn; dc->realize = ramfb_realizefn;
dc->props = ramfb_properties;
dc->desc = "ram framebuffer standalone device"; dc->desc = "ram framebuffer standalone device";
dc->user_creatable = true; dc->user_creatable = true;
} }

View File

@ -12,6 +12,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/option.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/display/ramfb.h" #include "hw/display/ramfb.h"
#include "ui/console.h" #include "ui/console.h"
@ -29,6 +30,7 @@ struct QEMU_PACKED RAMFBCfg {
struct RAMFBState { struct RAMFBState {
DisplaySurface *ds; DisplaySurface *ds;
uint32_t width, height; uint32_t width, height;
uint32_t starting_width, starting_height;
struct RAMFBCfg cfg; struct RAMFBCfg cfg;
bool locked; bool locked;
}; };
@ -114,9 +116,11 @@ static void ramfb_reset(void *opaque)
RAMFBState *s = (RAMFBState *)opaque; RAMFBState *s = (RAMFBState *)opaque;
s->locked = false; s->locked = false;
memset(&s->cfg, 0, sizeof(s->cfg)); memset(&s->cfg, 0, sizeof(s->cfg));
s->cfg.width = s->starting_width;
s->cfg.height = s->starting_height;
} }
RAMFBState *ramfb_setup(Error **errp) RAMFBState *ramfb_setup(DeviceState* dev, Error **errp)
{ {
FWCfgState *fw_cfg = fw_cfg_find(); FWCfgState *fw_cfg = fw_cfg_find();
RAMFBState *s; RAMFBState *s;
@ -128,6 +132,16 @@ RAMFBState *ramfb_setup(Error **errp)
s = g_new0(RAMFBState, 1); 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; s->locked = false;
rom_add_vga("vgabios-ramfb.bin"); rom_add_vga("vgabios-ramfb.bin");

View File

@ -352,7 +352,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp)
&vfio_display_dmabuf_ops, &vfio_display_dmabuf_ops,
vdev); vdev);
if (vdev->enable_ramfb) { if (vdev->enable_ramfb) {
vdev->dpy->ramfb = ramfb_setup(errp); vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp);
} }
vfio_display_edid_init(vdev); vfio_display_edid_init(vdev);
return 0; return 0;
@ -478,7 +478,7 @@ static int vfio_display_region_init(VFIOPCIDevice *vdev, Error **errp)
&vfio_display_region_ops, &vfio_display_region_ops,
vdev); vdev);
if (vdev->enable_ramfb) { if (vdev->enable_ramfb) {
vdev->dpy->ramfb = ramfb_setup(errp); vdev->dpy->ramfb = ramfb_setup(DEVICE(vdev), errp);
} }
return 0; return 0;
} }

View File

@ -4,7 +4,7 @@
/* ramfb.c */ /* ramfb.c */
typedef struct RAMFBState RAMFBState; typedef struct RAMFBState RAMFBState;
void ramfb_display_update(QemuConsole *con, RAMFBState *s); void ramfb_display_update(QemuConsole *con, RAMFBState *s);
RAMFBState *ramfb_setup(Error **errp); RAMFBState *ramfb_setup(DeviceState *dev, Error **errp);
/* ramfb-standalone.c */ /* ramfb-standalone.c */
#define TYPE_RAMFB_DEVICE "ramfb" #define TYPE_RAMFB_DEVICE "ramfb"

View File

@ -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"); error_setg(errp, "ramfb support not available");
return NULL; return NULL;