openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cirrus: allow zero source pitch in pattern fill rops 

The rops used by cirrus_bitblt_common_patterncopy only use
the destination pitch, so the source pitch shoul allowed to
be zero and the blit with used for the range check around the
source address.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Message-id: 1485272138-23249-1-git-send-email-w.bumiller@proxmox.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Wolfgang Bumiller 2017-01-24 16:35:38 +01:00 committed by Gerd Hoffmann
parent f153b563f8
commit 5858dd1801
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/display/cirrus_vga.c
View File

@ -272,9 +272,6 @@ static void cirrus_update_memory_access(CirrusVGAState *s);
static bool blit_region_is_unsafe(struct CirrusVGAState *s, static bool blit_region_is_unsafe(struct CirrusVGAState *s,
int32_t pitch, int32_t addr) int32_t pitch, int32_t addr)
{ {
if (!pitch) {
return true;
}
if (pitch < 0) { if (pitch < 0) {
int64_t min = addr int64_t min = addr
+ ((int64_t)s->cirrus_blt_height-1) * pitch; + ((int64_t)s->cirrus_blt_height-1) * pitch;
@ -294,8 +291,11 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s,
return false; return false;
} }
static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only) static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
bool zero_src_pitch_ok)
{ {
int32_t check_pitch;
/* should be the case, see cirrus_bitblt_start */ /* should be the case, see cirrus_bitblt_start */
assert(s->cirrus_blt_width > 0); assert(s->cirrus_blt_width > 0);
assert(s->cirrus_blt_height > 0); assert(s->cirrus_blt_height > 0);
@ -304,6 +304,10 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
return true; return true;
} }
if (!s->cirrus_blt_dstpitch) {
return true;
}
if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch, if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) { s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) {
return true; return true;
@ -311,7 +315,13 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
if (dst_only) { if (dst_only) {
return false; return false;
} }
if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
check_pitch = s->cirrus_blt_srcpitch;
if (!zero_src_pitch_ok && !check_pitch) {
check_pitch = s->cirrus_blt_width;
}
if (blit_region_is_unsafe(s, check_pitch,
s->cirrus_blt_srcaddr & s->cirrus_addr_mask)) { s->cirrus_blt_srcaddr & s->cirrus_addr_mask)) {
return true; return true;
} }
@ -681,8 +691,9 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState * s,
dst = s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask); dst = s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask);
if (blit_is_unsafe(s, false)) if (blit_is_unsafe(s, false, true)) {
return 0; return 0;
}
(*s->cirrus_rop) (s, dst, src, (*s->cirrus_rop) (s, dst, src,
s->cirrus_blt_dstpitch, 0, s->cirrus_blt_dstpitch, 0,
@ -699,7 +710,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
{ {
cirrus_fill_t rop_func; cirrus_fill_t rop_func;
if (blit_is_unsafe(s, true)) { if (blit_is_unsafe(s, true, true)) {
return 0; return 0;
} }
rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1]; rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1];
@ -803,7 +814,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s) static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
{ {
if (blit_is_unsafe(s, false)) if (blit_is_unsafe(s, false, false))
return 0; return 0;
return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr, return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,