|
 |
4a2fec |
From a66572373f31b1267b85f9e4da23a74b82280d14 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
Date: Fri, 20 Oct 2017 07:19:23 +0200
|
|
|
4a2fec |
Subject: [PATCH 01/19] vga: drop line_offset variable
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
Message-id: <20171020071925.9483-3-kraxel@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77390
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 2/4] vga: drop line_offset variable
|
|
|
4a2fec |
Bugzilla: 1501301
|
|
|
4a2fec |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 362f811793ff6cb4d209ab61d76cc4f841bb5e46)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/display/vga.c | 7 +++----
|
|
|
4a2fec |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/display/vga.c b/hw/display/vga.c
|
|
|
4a2fec |
index 497c823..895e95c 100644
|
|
|
4a2fec |
--- a/hw/display/vga.c
|
|
|
4a2fec |
+++ b/hw/display/vga.c
|
|
|
4a2fec |
@@ -1464,7 +1464,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
DisplaySurface *surface = qemu_console_surface(s->con);
|
|
|
4a2fec |
int y1, y, update, linesize, y_start, double_scan, mask, depth;
|
|
|
4a2fec |
- int width, height, shift_control, line_offset, bwidth, bits;
|
|
|
4a2fec |
+ int width, height, shift_control, bwidth, bits;
|
|
|
4a2fec |
ram_addr_t page0, page1;
|
|
|
4a2fec |
DirtyBitmapSnapshot *snap = NULL;
|
|
|
4a2fec |
int disp_width, multi_scan, multi_run;
|
|
|
4a2fec |
@@ -1614,7 +1614,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
4a2fec |
s->cursor_invalidate(s);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
- line_offset = s->line_offset;
|
|
|
4a2fec |
#if 0
|
|
|
4a2fec |
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",
|
|
|
4a2fec |
width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE],
|
|
|
4a2fec |
@@ -1629,7 +1628,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
4a2fec |
|
|
|
4a2fec |
if (!full_update) {
|
|
|
4a2fec |
ram_addr_t region_start = addr1;
|
|
|
4a2fec |
- ram_addr_t region_end = addr1 + line_offset * height;
|
|
|
4a2fec |
+ ram_addr_t region_end = addr1 + s->line_offset * height;
|
|
|
4a2fec |
vga_sync_dirty_bitmap(s);
|
|
|
4a2fec |
if (s->line_compare < height) {
|
|
|
4a2fec |
/* split screen mode */
|
|
|
4a2fec |
@@ -1681,7 +1680,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
|
|
4a2fec |
if (!multi_run) {
|
|
|
4a2fec |
mask = (s->cr[VGA_CRTC_MODE] & 3) ^ 3;
|
|
|
4a2fec |
if ((y1 & mask) == mask)
|
|
|
4a2fec |
- addr1 += line_offset;
|
|
|
4a2fec |
+ addr1 += s->line_offset;
|
|
|
4a2fec |
y1++;
|
|
|
4a2fec |
multi_run = multi_scan;
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|