|
 |
34b321 |
From c5ee3f3aab59ff26b0fed770077a16714da9696e Mon Sep 17 00:00:00 2001
|
|
|
e96cb2 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
34b321 |
Date: Thu, 28 Apr 2016 16:07:27 +0200
|
|
|
34b321 |
Subject: [PATCH 22/27] vga: Remove some "should be done in BIOS" comments
|
|
|
e96cb2 |
|
|
|
e96cb2 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
34b321 |
Message-id: <1461859652-20918-2-git-send-email-kraxel@redhat.com>
|
|
|
34b321 |
Patchwork-id: 70292
|
|
|
34b321 |
O-Subject: [virt-devel] [RHEL-7.3 qemu-kvm PATCH 1/6] vga: Remove some "should be done in BIOS" comments
|
|
|
34b321 |
Bugzilla: 1331413
|
|
|
e96cb2 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
e96cb2 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
e96cb2 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
e96cb2 |
|
|
|
e96cb2 |
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
|
e96cb2 |
|
|
|
e96cb2 |
Not all platforms have a VGA BIOS, powerpc typically relies on
|
|
|
e96cb2 |
using the DISPI interface to initialize the card.
|
|
|
e96cb2 |
|
|
|
e96cb2 |
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
|
e96cb2 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
e96cb2 |
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
34b321 |
(cherry picked from commit ace89b8ff21cc3fb20986a334e54e6e6a1ccf729)
|
|
|
e96cb2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
e96cb2 |
---
|
|
|
e96cb2 |
hw/display/vga.c | 6 ++----
|
|
|
e96cb2 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
e96cb2 |
|
|
|
e96cb2 |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
e96cb2 |
index 0761b9e..48dad03 100644
|
|
|
e96cb2 |
--- a/hw/display/vga.c
|
|
|
e96cb2 |
+++ b/hw/display/vga.c
|
|
|
e96cb2 |
@@ -764,14 +764,13 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
|
|
|
e96cb2 |
s->vbe_regs[VBE_DISPI_INDEX_ENABLE] |= VBE_DISPI_ENABLED;
|
|
|
e96cb2 |
vbe_fixup_regs(s);
|
|
|
e96cb2 |
|
|
|
e96cb2 |
- /* clear the screen (should be done in BIOS) */
|
|
|
e96cb2 |
+ /* clear the screen */
|
|
|
e96cb2 |
if (!(val & VBE_DISPI_NOCLEARMEM)) {
|
|
|
e96cb2 |
memset(s->vram_ptr, 0,
|
|
|
e96cb2 |
s->vbe_regs[VBE_DISPI_INDEX_YRES] * s->vbe_line_offset);
|
|
|
e96cb2 |
}
|
|
|
e96cb2 |
|
|
|
e96cb2 |
- /* we initialize the VGA graphic mode (should be done
|
|
|
e96cb2 |
- in BIOS) */
|
|
|
e96cb2 |
+ /* we initialize the VGA graphic mode */
|
|
|
e96cb2 |
/* graphic mode + memory map 1 */
|
|
|
e96cb2 |
s->gr[VGA_GFX_MISC] = (s->gr[VGA_GFX_MISC] & ~0x0c) | 0x04 |
|
|
|
e96cb2 |
VGA_GR06_GRAPHICS_MODE;
|
|
|
e96cb2 |
@@ -804,7 +803,6 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
|
|
|
e96cb2 |
(shift_control << 5);
|
|
|
e96cb2 |
s->cr[VGA_CRTC_MAX_SCAN] &= ~0x9f; /* no double scan */
|
|
|
e96cb2 |
} else {
|
|
|
e96cb2 |
- /* XXX: the bios should do that */
|
|
|
e96cb2 |
s->bank_offset = 0;
|
|
|
e96cb2 |
}
|
|
|
e96cb2 |
s->dac_8bit = (val & VBE_DISPI_8BIT_DAC) > 0;
|
|
|
e96cb2 |
--
|
|
|
e96cb2 |
1.8.3.1
|
|
|
e96cb2 |
|