Fixes for QXL (rhbz 1462381)

2 files changed, 131 insertions, 2 deletions

diff --git a/kernel.spec b/kernel.spec
index c89800774..07e4e4c3a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -690,8 +690,8 @@ Patch716: md-raid-reset-bio-allocated-from-mempool.patch
 # CVE-2017-14051 rhbz 1487126 1487127
 Patch717: v2-scsi-qla2xxx-Fix-an-integer-overflow-in-sysfs-code.patch
 
-# Should fix our QXL issues (Didn't)
-# Patch718: qxl-fix-primary-surface-handling.patch
+# Should fix our QXL issues
+Patch718: qxl-fixes.patch
 
 # rhbz 1463000
 Patch719: 0001-xen-balloon-don-t-online-new-memory-initially.patch
@@ -2276,6 +2276,9 @@ fi
 #
 #
 %changelog
+* Mon Sep 18 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fixes for QXL (rhbz 1462381)
+
 * Thu Sep 14 2017 Justin M. Forbes <jforbes@redhat.com> - 4.12.13-200
 - Linux v4.12.13
 
diff --git a/qxl-fixes.patch b/qxl-fixes.patch
new file mode 100644
index 000000000..0b39c6f01
--- /dev/null
+++ b/qxl-fixes.patch
@@ -0,0 +1,126 @@
+From c463b4ad6b2ac5a40c959e6c636eafc7edb1a63b Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Wed, 6 Sep 2017 11:31:51 +0200
+Subject: qxl: fix primary surface handling
+
+The atomic conversion of the qxl driver didn't got the primary surface
+handling completely right.  It works in the common simple cases, but
+fails for example when changing the display resolution using xrandr or
+in multihead setups.
+
+The rules are simple:  There is one primary surface.  Before defining a
+new one you have to destroy the old one.
+
+This patch makes qxl_primary_atomic_update() destroy the primary surface
+before defining a new one.  It fixes is_primary flag updates.  It adds
+is_primary checks so we don't try to update the primary surface in case
+it already has the state we want it being in.
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ drivers/gpu/drm/qxl/qxl_display.c | 34 +++++++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
+index 03fe182..7babdd8f 100644
+--- a/drivers/gpu/drm/qxl/qxl_display.c
++++ b/drivers/gpu/drm/qxl/qxl_display.c
+@@ -512,23 +512,25 @@ static void qxl_primary_atomic_update(struct drm_plane *plane,
+ 	    .y2 = qfb->base.height
+ 	};
+ 
+-	if (!old_state->fb) {
+-		qxl_io_log(qdev,
+-			   "create primary fb: %dx%d,%d,%d\n",
+-			   bo->surf.width, bo->surf.height,
+-			   bo->surf.stride, bo->surf.format);
++	if (old_state->fb) {
++		qfb_old = to_qxl_framebuffer(old_state->fb);
++		bo_old = gem_to_qxl_bo(qfb_old->obj);
++	} else {
++		bo_old = NULL;
++	}
+ 
+-		qxl_io_create_primary(qdev, 0, bo);
+-		bo->is_primary = true;
++	if (bo == bo_old)
+ 		return;
+ 
+-	} else {
+-		qfb_old = to_qxl_framebuffer(old_state->fb);
+-		bo_old = gem_to_qxl_bo(qfb_old->obj);
++	if (bo_old && bo_old->is_primary) {
++		qxl_io_destroy_primary(qdev);
+ 		bo_old->is_primary = false;
+ 	}
+ 
+-	bo->is_primary = true;
++	if (!bo->is_primary) {
++		qxl_io_create_primary(qdev, 0, bo);
++		bo->is_primary = true;
++	}
+ 	qxl_draw_dirty_fb(qdev, qfb, bo, 0, 0, &norect, 1, 1);
+ }
+ 
+@@ -537,13 +539,15 @@ static void qxl_primary_atomic_disable(struct drm_plane *plane,
+ {
+ 	struct qxl_device *qdev = plane->dev->dev_private;
+ 
+-	if (old_state->fb)
+-	{	struct qxl_framebuffer *qfb =
++	if (old_state->fb) {
++		struct qxl_framebuffer *qfb =
+ 			to_qxl_framebuffer(old_state->fb);
+ 		struct qxl_bo *bo = gem_to_qxl_bo(qfb->obj);
+ 
+-		qxl_io_destroy_primary(qdev);
+-		bo->is_primary = false;
++		if (bo->is_primary) {
++			qxl_io_destroy_primary(qdev);
++			bo->is_primary = false;
++		}
+ 	}
+ }
+ 
+-- 
+cgit v0.12
+
+From 05026e6e19b29104ddba4e8979e6c7af17944695 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Fri, 15 Sep 2017 12:46:15 +0200
+Subject: [testing] qxl: fix pinning
+
+cleanup_fb() unpins the just activated framebuffer instead of the
+old one.  Oops.
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ drivers/gpu/drm/qxl/qxl_display.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
+index 7babdd8f..afc2272 100644
+--- a/drivers/gpu/drm/qxl/qxl_display.c
++++ b/drivers/gpu/drm/qxl/qxl_display.c
+@@ -705,14 +705,15 @@ static void qxl_plane_cleanup_fb(struct drm_plane *plane,
+ 	struct drm_gem_object *obj;
+ 	struct qxl_bo *user_bo;
+ 
+-	if (!plane->state->fb) {
+-		/* we never executed prepare_fb, so there's nothing to
++	if (!old_state->fb) {
++		/*
++		 * we never executed prepare_fb, so there's nothing to
+ 		 * unpin.
+ 		 */
+ 		return;
+ 	}
+ 
+-	obj = to_qxl_framebuffer(plane->state->fb)->obj;
++	obj = to_qxl_framebuffer(old_state->fb)->obj;
+ 	user_bo = gem_to_qxl_bo(obj);
+ 	qxl_bo_unpin(user_bo);
+ }
+-- 
+cgit v0.12
+