update to qemu-2.9.0-rc2

[pve-qemu-kvm.git] / debian / patches / extra / 0002-Revert-cirrus-allow-zero-source-pitch-in-pattern-fil.patch

diff --git a/debian/patches/extra/0002-Revert-cirrus-allow-zero-source-pitch-in-pattern-fil.patch b/debian/patches/extra/0002-Revert-cirrus-allow-zero-source-pitch-in-pattern-fil.patch
deleted file mode 100644 (file)
index 0b8e6ed..0000000
--- a/debian/patches/extra/0002-Revert-cirrus-allow-zero-source-pitch-in-pattern-fil.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From cba280fe94eaed53952e2997cac1ee2bed6cfdee Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Fri, 10 Feb 2017 08:34:03 +0100
-Subject: [PATCH 2/2] Revert "cirrus: allow zero source pitch in pattern fill
- rops"
-
-This reverts commit cf9c099a7694eb47ded529e1ed40ee8789f32d31.
-
-Conflicts:
-       hw/display/cirrus_vga.c
----
- hw/display/cirrus_vga.c | 29 +++++++++--------------------
- 1 file changed, 9 insertions(+), 20 deletions(-)
-
-diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
-index 6bd13fc..92e7951 100644
---- a/hw/display/cirrus_vga.c
-+++ b/hw/display/cirrus_vga.c
-@@ -272,6 +272,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s);
- static bool blit_region_is_unsafe(struct CirrusVGAState *s,
-                                   int32_t pitch, int32_t addr)
- {
-+    if (!pitch) {
-+        return true;
-+    }
-     if (pitch < 0) {
-         int64_t min = addr
-             + ((int64_t)s->cirrus_blt_height - 1) * pitch
-@@ -290,11 +293,8 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s,
-     return false;
- }
- 
--static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
--                           bool zero_src_pitch_ok)
-+static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only)
- {
--    int32_t check_pitch;
--
-     /* should be the case, see cirrus_bitblt_start */
-     assert(s->cirrus_blt_width > 0);
-     assert(s->cirrus_blt_height > 0);
-@@ -303,10 +303,6 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
-         return true;
-     }
- 
--    if (!s->cirrus_blt_dstpitch) {
--        return true;
--    }
--
-     if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
-                               s->cirrus_blt_dstaddr)) {
-         return true;
-@@ -314,14 +310,8 @@ static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only,
-     if (dst_only) {
-         return false;
-     }
--
--    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)) {
-+    if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch,
-+                              s->cirrus_blt_srcaddr & s->cirrus_addr_mask)) {
-         return true;
-     }
- 
-@@ -715,9 +705,8 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState *s, bool videosrc)
-         src = s->cirrus_bltbuf;
-     }
- 
--    if (blit_is_unsafe(s, true, true)) {
-+    if (blit_is_unsafe(s, true))
-         return 0;
--    }
- 
-     (*s->cirrus_rop) (s, dst, src,
-                       s->cirrus_blt_dstpitch, 0,
-@@ -734,7 +723,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop)
- {
-     cirrus_fill_t rop_func;
- 
--    if (blit_is_unsafe(s, true, true)) {
-+    if (blit_is_unsafe(s, true)) {
-         return 0;
-     }
-     rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1];
-@@ -834,7 +823,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
- 
- static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
- {
--    if (blit_is_unsafe(s, false, false))
-+    if (blit_is_unsafe(s, false))
-         return 0;
- 
-     return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
--- 
-2.1.4
-