|
 |
9ae3a8 |
From 2e02d49769291dda0436ec3d113c5b4917037f3f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 15 Sep 2014 13:08:20 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 1/4] vbe: make bochs dispi interface return the correct memory size with qxl
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1410786503-19794-2-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 61135
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/4] vbe: make bochs dispi interface return the correct memory size with qxl
|
|
|
9ae3a8 |
Bugzilla: 1139118
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
VgaState->vram_size is the size of the pci bar. In case of qxl not the
|
|
|
9ae3a8 |
whole pci bar can be used as vga framebuffer. Add a new variable
|
|
|
9ae3a8 |
vbe_size to handle that case. By default (if unset) it equals
|
|
|
9ae3a8 |
vram_size, but qxl can set vbe_size to something else.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This makes sure VBE_DISPI_INDEX_VIDEO_MEMORY_64K returns correct results
|
|
|
9ae3a8 |
and sanity checks are done with the correct size too.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Cc: qemu-stable@nongnu.org
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 54a85d462447c1cb8a1638578a7fd086350b4d2d)
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/display/qxl.c | 1 +
|
|
|
9ae3a8 |
hw/display/vga.c | 7 +++++--
|
|
|
9ae3a8 |
hw/display/vga_int.h | 1 +
|
|
|
9ae3a8 |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
|
|
|
9ae3a8 |
index 6f8adc8..f11210c 100644
|
|
|
9ae3a8 |
--- a/hw/display/qxl.c
|
|
|
9ae3a8 |
+++ b/hw/display/qxl.c
|
|
|
9ae3a8 |
@@ -2056,6 +2056,7 @@ static int qxl_init_primary(PCIDevice *dev)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
qxl->id = 0;
|
|
|
9ae3a8 |
qxl_init_ramsize(qxl);
|
|
|
9ae3a8 |
+ vga->vbe_size = qxl->vgamem_size;
|
|
|
9ae3a8 |
vga->vram_size_mb = qxl->vga.vram_size >> 20;
|
|
|
9ae3a8 |
vga_common_init(vga);
|
|
|
9ae3a8 |
vga_init(vga, pci_address_space(dev), pci_address_space_io(dev), false);
|
|
|
9ae3a8 |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
9ae3a8 |
index 21a108d..d703d90 100644
|
|
|
9ae3a8 |
--- a/hw/display/vga.c
|
|
|
9ae3a8 |
+++ b/hw/display/vga.c
|
|
|
9ae3a8 |
@@ -613,7 +613,7 @@ uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
|
|
|
9ae3a8 |
val = s->vbe_regs[s->vbe_index];
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
} else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) {
|
|
|
9ae3a8 |
- val = s->vram_size / (64 * 1024);
|
|
|
9ae3a8 |
+ val = s->vbe_size / (64 * 1024);
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
val = 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -752,7 +752,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
|
|
|
9ae3a8 |
line_offset = w >> 1;
|
|
|
9ae3a8 |
else
|
|
|
9ae3a8 |
line_offset = w * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3);
|
|
|
9ae3a8 |
- h = s->vram_size / line_offset;
|
|
|
9ae3a8 |
+ h = s->vbe_size / line_offset;
|
|
|
9ae3a8 |
/* XXX: support weird bochs semantics ? */
|
|
|
9ae3a8 |
if (h < s->vbe_regs[VBE_DISPI_INDEX_YRES])
|
|
|
9ae3a8 |
return;
|
|
|
9ae3a8 |
@@ -2290,6 +2290,9 @@ void vga_common_init(VGACommonState *s)
|
|
|
9ae3a8 |
s->vram_size <<= 1;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
s->vram_size_mb = s->vram_size >> 20;
|
|
|
9ae3a8 |
+ if (!s->vbe_size) {
|
|
|
9ae3a8 |
+ s->vbe_size = s->vram_size;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
s->is_vbe_vmstate = 1;
|
|
|
9ae3a8 |
memory_region_init_ram(&s->vram, "vga.vram", s->vram_size);
|
|
|
9ae3a8 |
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
|
|
|
9ae3a8 |
index 66f9f3c..5a2f466 100644
|
|
|
9ae3a8 |
--- a/hw/display/vga_int.h
|
|
|
9ae3a8 |
+++ b/hw/display/vga_int.h
|
|
|
9ae3a8 |
@@ -93,6 +93,7 @@ typedef struct VGACommonState {
|
|
|
9ae3a8 |
MemoryRegion vram_vbe;
|
|
|
9ae3a8 |
uint32_t vram_size;
|
|
|
9ae3a8 |
uint32_t vram_size_mb; /* property */
|
|
|
9ae3a8 |
+ uint32_t vbe_size;
|
|
|
9ae3a8 |
uint32_t latch;
|
|
|
9ae3a8 |
MemoryRegion *chain4_alias;
|
|
|
9ae3a8 |
uint8_t sr_index;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|