Commit c326eedc authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

Revert "hw/display/ramfb: lock guest resolution after it's set" 



This reverts commit a9e0cb67.

This breaks OVMF.  Reproducer: Just hit 'ESC' at early boot to enter
firmware setup.  OVMF wants switch from (default) 800x600 to 640x480 for
that, and this patch blocks it.

Cc: Hou Qiming <hqm03ster@gmail.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-id: 20200429115236.28709-3-kraxel@redhat.com
parent 2fc979cb

hw/display/ramfb.c

+4 −22
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct RAMFBState { 
    DisplaySurface *ds;

    uint32_t width, height;

    struct RAMFBCfg cfg;

    bool locked;

};



static void ramfb_unmap_display_surface(pixman_image_t *image, void *unused)
@@ -72,25 +71,18 @@ 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;

    uint32_t fourcc, format, width, height;

    uint32_t fourcc, format;

    hwaddr stride, addr;



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

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

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

    s->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);

    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__);

        return;

    }

    s->locked = true;

    s->width = width;

    s->height = height;

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

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

                                         format, stride, addr);

}
@@ -110,13 +102,6 @@ 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));

}



RAMFBState *ramfb_setup(Error **errp)

{

    FWCfgState *fw_cfg = fw_cfg_find();
@@ -129,12 +114,9 @@ RAMFBState *ramfb_setup(Error **errp) 


    s = g_new0(RAMFBState, 1);



    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;

}