[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] Revert "hw/display/ramfb: lock guest resolution after it's se
From: |
Gerd Hoffmann |
Subject: |
[PULL 4/8] Revert "hw/display/ramfb: lock guest resolution after it's set" |
Date: |
Mon, 18 May 2020 17:12:51 +0200 |
This reverts commit a9e0cb67b7f4c485755659f9b764c38b5f970de4.
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
---
hw/display/ramfb.c | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c
index bd4746dc1768..9d41c2ad2868 100644
--- a/hw/display/ramfb.c
+++ b/hw/display/ramfb.c
@@ -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;
}
--
2.18.4
- [PULL 0/8] Vga 20200518 patches, Gerd Hoffmann, 2020/05/18
- [PULL 3/8] Revert "hw/display/ramfb: initialize fw-config space with xres/ yres", Gerd Hoffmann, 2020/05/18
- [PULL 8/8] ramfb: fix size calculation, Gerd Hoffmann, 2020/05/18
- [PULL 5/8] ramfb: drop leftover debug message, Gerd Hoffmann, 2020/05/18
- [PULL 7/8] ramfb: add sanity checks to ramfb_create_display_surface, Gerd Hoffmann, 2020/05/18
- [PULL 2/8] hw/display: Include local 'framebuffer.h', Gerd Hoffmann, 2020/05/18
- [PULL 1/8] ati-vga: Do not allow unaligned access via index register, Gerd Hoffmann, 2020/05/18
- [PULL 4/8] Revert "hw/display/ramfb: lock guest resolution after it's set",
Gerd Hoffmann <=
- [PULL 6/8] ramfb: don't update RAMFBState on errors, Gerd Hoffmann, 2020/05/18
- Re: [PULL 0/8] Vga 20200518 patches, Peter Maydell, 2020/05/18