diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-03-19 12:20:52 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-05-15 10:11:48 +0200 |
| commit | a3fd63c2342bd84a5487e280e2899250ec440d98 (patch) | |
| tree | e223d3e4dbf9419bdb824e0197bd581a0fb42641 /vgasrc | |
| parent | 2f87fe393cd48327c4c0d5614bdef8f00d63012a (diff) | |
| download | qemu-seabios-a3fd63c2342bd84a5487e280e2899250ec440d98.tar.gz | |
bochsdisplay: parse resolution from edid.
Then use the resolution for the framebuffer.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'vgasrc')
| -rw-r--r-- | vgasrc/bochsdisplay.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/vgasrc/bochsdisplay.c b/vgasrc/bochsdisplay.c index 38891b5..61689d6 100644 --- a/vgasrc/bochsdisplay.c +++ b/vgasrc/bochsdisplay.c @@ -10,8 +10,6 @@ #define FRAMEBUFFER_WIDTH 1024 #define FRAMEBUFFER_HEIGHT 768 #define FRAMEBUFFER_BPP 4 -#define FRAMEBUFFER_STRIDE (FRAMEBUFFER_BPP * FRAMEBUFFER_WIDTH) -#define FRAMEBUFFER_SIZE (FRAMEBUFFER_STRIDE * FRAMEBUFFER_HEIGHT) int bochs_display_setup(void) @@ -46,16 +44,26 @@ bochs_display_setup(void) for (i = 0; i < sizeof(VBE_edid); i++) SET_VGA(VBE_edid[i], readb(edid + i)); + int fb_width = FRAMEBUFFER_WIDTH; + int fb_height = FRAMEBUFFER_HEIGHT; + if (GET_GLOBAL(VBE_edid[0]) == 0x00 && + GET_GLOBAL(VBE_edid[1]) == 0xff) { + fb_width = GET_GLOBAL(VBE_edid[54 + 2]); + fb_width |= (GET_GLOBAL(VBE_edid[54 + 4]) & 0xf0) << 4; + fb_height = GET_GLOBAL(VBE_edid[54 + 5]); + fb_height |= (GET_GLOBAL(VBE_edid[54 + 7]) & 0xf0) << 4; + } + int fb_stride = FRAMEBUFFER_BPP * fb_width; + dprintf(1, "bochs-display: using %dx%d, %d bpp (%d stride)\n" - , FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT - , FRAMEBUFFER_BPP * 8, FRAMEBUFFER_STRIDE); + , fb_width, fb_height + , FRAMEBUFFER_BPP * 8, fb_stride); cbvga_setup_modes(lfb_addr, FRAMEBUFFER_BPP * 8, - FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT, - FRAMEBUFFER_STRIDE); + fb_width, fb_height, fb_stride); - writew(dispi + VBE_DISPI_INDEX_XRES, FRAMEBUFFER_WIDTH); - writew(dispi + VBE_DISPI_INDEX_YRES, FRAMEBUFFER_HEIGHT); + writew(dispi + VBE_DISPI_INDEX_XRES, fb_width); + writew(dispi + VBE_DISPI_INDEX_YRES, fb_height); writew(dispi + VBE_DISPI_INDEX_BPP, FRAMEBUFFER_BPP * 8); writew(dispi + VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED); |