|
 |
12e206 |
From 68dd20867cb9103d0d51ba0223d677e74b7cc51a Mon Sep 17 00:00:00 2001
|
|
|
12e206 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
12e206 |
Date: Fri, 20 Oct 2017 11:06:16 +0200
|
|
|
12e206 |
Subject: [PATCH 08/11] vga: drop line_offset variable
|
|
|
12e206 |
|
|
|
12e206 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
12e206 |
Message-id: <20171020110619.2541-9-kraxel@redhat.com>
|
|
|
12e206 |
Patchwork-id: 77399
|
|
|
12e206 |
O-Subject: [RHEL-7.5 qemu-kvm PATCH 08/11] vga: drop line_offset variable
|
|
|
12e206 |
Bugzilla: 1501294
|
|
|
12e206 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
12e206 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
12e206 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
12e206 |
|
|
|
12e206 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
12e206 |
(cherry picked from commit 362f811793ff6cb4d209ab61d76cc4f841bb5e46)
|
|
|
12e206 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
12e206 |
---
|
|
|
12e206 |
hw/display/vga.c | 5 ++---
|
|
|
12e206 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
12e206 |
|
|
|
12e206 |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
12e206 |
index 5b0b864..dda3f5f 100644
|
|
|
12e206 |
--- a/hw/display/vga.c
|
|
|
12e206 |
+++ b/hw/display/vga.c
|
|
|
12e206 |
@@ -1504,7 +1504,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
12e206 |
{
|
|
|
12e206 |
DisplaySurface *surface = qemu_console_surface(s->con);
|
|
|
12e206 |
int y1, y, update, linesize, y_start, double_scan, mask, depth;
|
|
|
12e206 |
- int width, height, shift_control, line_offset, bwidth, bits;
|
|
|
12e206 |
+ int width, height, shift_control, bwidth, bits;
|
|
|
12e206 |
ram_addr_t page0, page1, page_min, page_max;
|
|
|
12e206 |
int disp_width, multi_scan, multi_run;
|
|
|
12e206 |
uint8_t *d;
|
|
|
12e206 |
@@ -1642,7 +1642,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
12e206 |
s->cursor_invalidate(s);
|
|
|
12e206 |
}
|
|
|
12e206 |
|
|
|
12e206 |
- line_offset = s->line_offset;
|
|
|
12e206 |
#if 0
|
|
|
12e206 |
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",
|
|
|
12e206 |
width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE],
|
|
|
12e206 |
@@ -1697,7 +1696,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
12e206 |
if (!multi_run) {
|
|
|
12e206 |
mask = (s->cr[VGA_CRTC_MODE] & 3) ^ 3;
|
|
|
12e206 |
if ((y1 & mask) == mask)
|
|
|
12e206 |
- addr1 += line_offset;
|
|
|
12e206 |
+ addr1 += s->line_offset;
|
|
|
12e206 |
y1++;
|
|
|
12e206 |
multi_run = multi_scan;
|
|
|
12e206 |
} else {
|
|
|
12e206 |
--
|
|
|
12e206 |
1.8.3.1
|
|
|
12e206 |
|