70b09a5bad
Update to v2.8.0, including integration of SLE qemu package so we are "Factory First" again for SLE qemu. Includes some spec file tweaks/cleanups as well. A number of post v2.8.0 security fixes are also included. OBS-URL: https://build.opensuse.org/request/show/461715 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=329
104 lines
4.4 KiB
Diff
104 lines
4.4 KiB
Diff
From 2d9d5517299f47f6cbc208de10cb54d6e0e3971e Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 25 Jan 2017 11:09:56 +0100
|
|
Subject: [PATCH] cirrus: fix blit address mask handling
|
|
|
|
Apply the cirrus_addr_mask to cirrus_blt_dstaddr and cirrus_blt_srcaddr
|
|
right after assigning them, in cirrus_bitblt_start(), instead of having
|
|
this all over the place in the cirrus code, and missing a few places.
|
|
|
|
Reported-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Message-id: 1485338996-17095-1-git-send-email-kraxel@redhat.com
|
|
(cherry picked from commit 60cd23e85151525ab26591394c4e7e06fa07d216)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/display/cirrus_vga.c | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
index 0f05e4596e..ef5da7acf7 100644
|
|
--- a/hw/display/cirrus_vga.c
|
|
+++ b/hw/display/cirrus_vga.c
|
|
@@ -305,14 +305,15 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
|
|
}
|
|
|
|
if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
|
|
- s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) {
|
|
+ s->cirrus_blt_dstaddr)) {
|
|
return true;
|
|
}
|
|
if (dst_only) {
|
|
return false;
|
|
}
|
|
+
|
|
if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
|
|
- s->cirrus_blt_srcaddr & s->cirrus_addr_mask)) {
|
|
+ s->cirrus_blt_srcaddr)) {
|
|
return true;
|
|
}
|
|
|
|
@@ -679,7 +680,7 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState * s,
|
|
{
|
|
uint8_t *dst;
|
|
|
|
- dst = s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask);
|
|
+ dst = s->vga.vram_ptr + s->cirrus_blt_dstaddr;
|
|
|
|
if (blit_is_unsafe(s, false))
|
|
return 0;
|
|
@@ -703,7 +704,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
|
|
return 0;
|
|
}
|
|
rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1];
|
|
- rop_func(s, s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask),
|
|
+ rop_func(s, s->vga.vram_ptr + s->cirrus_blt_dstaddr,
|
|
s->cirrus_blt_dstpitch,
|
|
s->cirrus_blt_width, s->cirrus_blt_height);
|
|
cirrus_invalidate_region(s, s->cirrus_blt_dstaddr,
|
|
@@ -721,9 +722,8 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
|
|
|
|
static int cirrus_bitblt_videotovideo_patterncopy(CirrusVGAState * s)
|
|
{
|
|
- return cirrus_bitblt_common_patterncopy(s,
|
|
- s->vga.vram_ptr + ((s->cirrus_blt_srcaddr & ~7) &
|
|
- s->cirrus_addr_mask));
|
|
+ return cirrus_bitblt_common_patterncopy(s, s->vga.vram_ptr +
|
|
+ (s->cirrus_blt_srcaddr & ~7));
|
|
}
|
|
|
|
static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
|
|
@@ -777,10 +777,8 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
|
|
if (notify)
|
|
graphic_hw_update(s->vga.con);
|
|
|
|
- (*s->cirrus_rop) (s, s->vga.vram_ptr +
|
|
- (s->cirrus_blt_dstaddr & s->cirrus_addr_mask),
|
|
- s->vga.vram_ptr +
|
|
- (s->cirrus_blt_srcaddr & s->cirrus_addr_mask),
|
|
+ (*s->cirrus_rop) (s, s->vga.vram_ptr + s->cirrus_blt_dstaddr,
|
|
+ s->vga.vram_ptr + s->cirrus_blt_srcaddr,
|
|
s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch,
|
|
s->cirrus_blt_width, s->cirrus_blt_height);
|
|
|
|
@@ -831,8 +829,7 @@ static void cirrus_bitblt_cputovideo_next(CirrusVGAState * s)
|
|
} else {
|
|
/* at least one scan line */
|
|
do {
|
|
- (*s->cirrus_rop)(s, s->vga.vram_ptr +
|
|
- (s->cirrus_blt_dstaddr & s->cirrus_addr_mask),
|
|
+ (*s->cirrus_rop)(s, s->vga.vram_ptr + s->cirrus_blt_dstaddr,
|
|
s->cirrus_bltbuf, 0, 0, s->cirrus_blt_width, 1);
|
|
cirrus_invalidate_region(s, s->cirrus_blt_dstaddr, 0,
|
|
s->cirrus_blt_width, 1);
|
|
@@ -951,6 +948,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
|
|
s->cirrus_blt_modeext = s->vga.gr[0x33];
|
|
blt_rop = s->vga.gr[0x32];
|
|
|
|
+ s->cirrus_blt_dstaddr &= s->cirrus_addr_mask;
|
|
+ s->cirrus_blt_srcaddr &= s->cirrus_addr_mask;
|
|
+
|
|
#ifdef DEBUG_BITBLT
|
|
printf("rop=0x%02x mode=0x%02x modeext=0x%02x w=%d h=%d dpitch=%d spitch=%d daddr=0x%08x saddr=0x%08x writemask=0x%02x\n",
|
|
blt_rop,
|