[xorg-x11-drv-qxl/f19] fix another resize issue due (#978612)

[Dave Airlie]

commit 30110ab1293a77c95cd06ac19b494f2d6f4d7008
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Jun 29 21:32:23 2013 +1000

    fix another resize issue due (#978612)

 ...-issue-with-resizing-dev_image-improperly.patch |   29 ++++++++++++++++++++
 xorg-x11-drv-qxl.spec                              |    6 +++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-qxl-fix-issue-with-resizing-dev_image-improperly.patch b/0001-qxl-fix-issue-with-resizing-dev_image-improperly.patch
new file mode 100644
index 0000000..3296cb7
--- /dev/null
+++ b/0001-qxl-fix-issue-with-resizing-dev_image-improperly.patch
@@ -0,0 +1,29 @@
+From 5376ed35a16516bcf97cc13666593d1518231d1f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Sat, 29 Jun 2013 21:28:33 +1000
+Subject: [PATCH] qxl: fix issue with resizing dev_image improperly
+
+this could result in a segfault when resizing.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ src/qxl_drmmode.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/qxl_drmmode.c b/src/qxl_drmmode.c
+index e19c7df..c1f5c15 100644
+--- a/src/qxl_drmmode.c
++++ b/src/qxl_drmmode.c
+@@ -814,8 +814,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+ 		void *dev_ptr = qxl->bo_funcs->bo_map(qxl->primary->bo);
+ 		uint32_t *dev_addr;
+ 		int format = scrn->bitsPerPixel == 16 ? PIXMAN_x1r5g5b5 : PIXMAN_x8r8g8b8;
+-		dev_addr
+-			= (uint32_t *)((uint8_t *)dev_ptr + pitch * (height - 1));
++		dev_addr = dev_ptr;
+ 		pixman_image_unref(qxl->primary->dev_image);
+ 		pixman_image_unref (qxl->primary->host_image);
+ 
+-- 
+1.8.3.1
+
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index 96c4ac3..06bc944 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -22,7 +22,7 @@ Name:      xorg-x11-drv-qxl
 
 Version:   0.1.1
 
-Release:   0.9%{?gver}%{?dist}
+Release:   0.10%{?gver}%{?dist}
 URL:       http://www.x.org
 #Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
@@ -33,6 +33,7 @@ Patch2:	   0002-Add-old-driver-in-as-a-compatibility-layer.patch
 Patch3:	   0003-Link-in-the-compat-driver-various-renamings.patch
 Patch4:	   0004-compat-bump-to-new-server-API-changes.patch
 Patch5:    qxl-kms-disable-composite.patch
+Patch6:    0001-qxl-fix-issue-with-resizing-dev_image-improperly.patch
 
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -125,6 +126,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf
 
 
 %changelog
+* Sat Jun 29 2013 Dave Airlie <airlied at redhat.com> 0.1.1-0.10
+- fix another resize issue due (#978612)
+
 * Tue Jun 18 2013 Dave Airlie <airlied at redhat.com> 0.1.1-0.9
 - disable composite/a8 surfaces for KMS (#974198)