Revert "cirrus: allow zero source pitch in pattern fill rops"
This reverts commit 5858dd1801
.
Conflicts:
hw/display/cirrus_vga.c
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-id: 1486645341-5010-2-git-send-email-kraxel@redhat.com
This commit is contained in:
parent
95280c31cd
commit
12e97ec399
|
@ -273,6 +273,9 @@ 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
|
||||||
|
@ -291,11 +294,8 @@ 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,10 +304,6 @@ 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_blt_dstaddr)) {
|
||||||
return true;
|
return true;
|
||||||
|
@ -315,13 +311,7 @@ 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_blt_srcaddr)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -716,7 +706,7 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState *s, bool videosrc)
|
||||||
src = s->cirrus_bltbuf;
|
src = s->cirrus_bltbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (blit_is_unsafe(s, true, true)) {
|
if (blit_is_unsafe(s, true)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -735,7 +725,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, true)) {
|
if (blit_is_unsafe(s, 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];
|
||||||
|
@ -835,7 +825,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, false))
|
if (blit_is_unsafe(s, 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,
|
||||||
|
|
Loading…
Reference in a new issue