Add 0001-disabling-primary-plane-in-the-noatomic-case.patch

3 files changed, 69 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index caaadc752762..c3d10a7fcc7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Dec 18 09:06:58 UTC 2015
+# Sat Jan  9 14:58:19 UTC 2016
 pkgbase = linux-w110er
 	pkgver = 4.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -20,6 +20,7 @@ pkgbase = linux-w110er
 	source = config.w110er
 	source = linux.preset
 	source = change-default-console-loglevel.patch
+	source = 0001-disabling-primary-plane-in-the-noatomic-case.patch
 	md5sums = 58b35794eee3b6d52ce7be39357801e7
 	md5sums = SKIP
 	md5sums = d3235b3640ae6ac1ab579171943fda4b
@@ -28,6 +29,7 @@ pkgbase = linux-w110er
 	md5sums = c320955ab7d7a76f509cb24b1b55229d
 	md5sums = eb14dcfd80c00852ef81ded6e826826a
 	md5sums = df7fceae6ee5d7e7be7b60ecd7f6bb35
+	md5sums = e4c5760bfd6da1f1052acd3f468917e8
 
 pkgname = linux-w110er
 	pkgdesc = Linux 4.3.3 kernel and modules optimized for Mountain F11 Netbook (Clevo W110ER). See PKGBUILD
diff --git a/0001-disabling-primary-plane-in-the-noatomic-case.patch b/0001-disabling-primary-plane-in-the-noatomic-case.patch
new file mode 100644
index 000000000000..241b1012e02e
--- /dev/null
+++ b/0001-disabling-primary-plane-in-the-noatomic-case.patch
@@ -0,0 +1,56 @@
+From 634b3a4a476e96816d5d6cd5bb9f8900a53f56ba Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Date: Mon, 23 Nov 2015 10:25:28 +0100
+Subject: drm/i915: Do a better job at disabling primary plane in the noatomic
+ case.
+
+When disable_noatomic is called plane_mask is not correct yet, and
+plane_state->visible = true is left as true after disabling the primary
+plane.
+
+Other planes are already disabled as part of crtc sanitization, only the
+primary is left active. But the plane_mask is not updated here. It gets
+updated during fb takeover in modeset_gem_init, or set to the new value
+on resume.
+
+This means that to disable the primary plane 1 << drm_plane_index(primary)
+needs to be used.
+
+Afterwards because the crtc is no longer active it's forbidden to keep
+plane_state->visible set, or a WARN_ON in
+intel_plane_atomic_calc_changes triggers. There are other code points
+that rely on accurate plane_state->visible too, so make sure the bool is
+cleared.
+
+The other planes are already disabled in intel_sanitize_crtc, so they
+don't have to be handled here.
+
+Cc: stable@vger.kernel.org #v4.3, v4.2?
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655
+Tested-by: Tomas Mezzadra <tmezzadra@gmail.com>
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: http://patchwork.freedesktop.org/patch/msgid/5652DB88.9070208@linux.intel.com
+(cherry picked from commit 54a4196188eab82e6f0a5f05716626e9f18b8fb6)
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 22e86d2..62211ab 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -6309,9 +6309,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
+ 	if (to_intel_plane_state(crtc->primary->state)->visible) {
+ 		intel_crtc_wait_for_pending_flips(crtc);
+ 		intel_pre_disable_primary(crtc);
++
++		intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
++		to_intel_plane_state(crtc->primary->state)->visible = false;
+ 	}
+ 
+-	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
+ 	dev_priv->display.crtc_disable(crtc);
+ 	intel_crtc->active = false;
+ 	intel_update_watermarks(crtc);
+-- 
+cgit v0.10.2
+
diff --git a/PKGBUILD b/PKGBUILD
index e783c838437a..bf6e350b1329 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@
 pkgbase=linux-w110er
 _srcname=linux-4.3
 pkgver=4.3.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -35,7 +35,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'config.w110er'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
-        'change-default-console-loglevel.patch')
+        'change-default-console-loglevel.patch'
+        "0001-disabling-primary-plane-in-the-noatomic-case.patch")
 
 md5sums=('58b35794eee3b6d52ce7be39357801e7'
          'SKIP'
@@ -44,7 +45,8 @@ md5sums=('58b35794eee3b6d52ce7be39357801e7'
          '2bb07837febe3baaced4c1c0afb0507c'
          'c320955ab7d7a76f509cb24b1b55229d'
          'eb14dcfd80c00852ef81ded6e826826a'
-         'df7fceae6ee5d7e7be7b60ecd7f6bb35')
+         'df7fceae6ee5d7e7be7b60ecd7f6bb35'
+         'e4c5760bfd6da1f1052acd3f468917e8')
 
 
 validpgpkeys=(
@@ -69,6 +71,10 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix #46968
+  # hangs on older intel hardware
+  patch -Np1 -i "${srcdir}/0001-disabling-primary-plane-in-the-noatomic-case.patch"
+
   #CPU OPTIMIZATIONS
   patch -Np1 -i "${srcdir}/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch"