53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 10 Oct 2017 16:13:21 +0200
|
|
Subject: [PATCH] vga: drop line_offset variable
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/display/vga.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
index a99d831e04..77af807a51 100644
|
|
--- a/hw/display/vga.c
|
|
+++ b/hw/display/vga.c
|
|
@@ -1464,7 +1464,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
{
|
|
DisplaySurface *surface = qemu_console_surface(s->con);
|
|
int y1, y, update, linesize, y_start, double_scan, mask, depth;
|
|
- int width, height, shift_control, line_offset, bwidth, bits;
|
|
+ int width, height, shift_control, bwidth, bits;
|
|
ram_addr_t page0, page1;
|
|
DirtyBitmapSnapshot *snap = NULL;
|
|
int disp_width, multi_scan, multi_run;
|
|
@@ -1614,7 +1614,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
s->cursor_invalidate(s);
|
|
}
|
|
|
|
- line_offset = s->line_offset;
|
|
#if 0
|
|
printf("w=%d h=%d v=%d line_offset=%d cr[0x09]=0x%02x cr[0x17]=0x%02x linecmp=%d sr[0x01]=0x%02x\n",
|
|
width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE],
|
|
@@ -1629,7 +1628,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
|
if (!full_update) {
|
|
ram_addr_t region_start = addr1;
|
|
- ram_addr_t region_end = addr1 + line_offset * height;
|
|
+ ram_addr_t region_end = addr1 + s->line_offset * height;
|
|
vga_sync_dirty_bitmap(s);
|
|
if (s->line_compare < height) {
|
|
/* split screen mode */
|
|
@@ -1681,7 +1680,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
if (!multi_run) {
|
|
mask = (s->cr[VGA_CRTC_MODE] & 3) ^ 3;
|
|
if ((y1 & mask) == mask)
|
|
- addr1 += line_offset;
|
|
+ addr1 += s->line_offset;
|
|
y1++;
|
|
multi_run = multi_scan;
|
|
} else {
|
|
--
|
|
2.11.0
|
|
|