linux-ck.patch

From 40e1d3cbe9a19a8c65451c3e4569e241ad753509 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <[email protected]>
Date: Thu, 17 Dec 2015 16:43:37 -0500
Subject: [PATCH] Apply patch to fix some busted intel displays

---

Now updated to apply cleanly against the latest linux-ck.

 ...-a-better-job-at-disabling-primary-plane-.patch | 56 ++++++++++++++++++++++
 PKGBUILD                                           |  5 ++
 2 files changed, 61 insertions(+)
 create mode 100644 0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch

diff --git a/0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch b/0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch
new file mode 100644
index 0000000..241b101
--- /dev/null
+++ b/0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch
@@ -0,0 +1,56 @@
+From 634b3a4a476e96816d5d6cd5bb9f8900a53f56ba Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <[email protected]>
+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: [email protected] #v4.3, v4.2?
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655
+Tested-by: Tomas Mezzadra <[email protected]>
+Signed-off-by: Maarten Lankhorst <[email protected]>
+Reviewed-by: Daniel Vetter <[email protected]>
+Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 54a4196188eab82e6f0a5f05716626e9f18b8fb6)
+Signed-off-by: Jani Nikula <[email protected]>
+
+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 df3f31e..fba075c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -70,6 +70,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 'config.x86_64' 'config'
 'linux-ck.preset'
 'change-default-console-loglevel.patch'
+'0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch'
 # ck3
 "http://ck.kolivas.org/patches/4.0/4.3/4.3-ck${_ckpatchversion}/${_ckpatchname}.xz"
 # gcc
@@ -86,6 +87,7 @@ sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
             '8e83d9306376750632e87bed77d4caf3475a4390a8f6673d58ee959b3722f12c'
             '2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            'abdd04bd6beecb7c961130a68d71e6332bd260462eeaa2f4f8e634de813dcc4d'
             '483c12e130285cbcb49648012416323a5cb8dd8a477fa064d96c2f53019f1b31'
             'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
             'ebeb62206999b2749ac43bb287a6a2a5db4f6b1b688a90cefa1ceb5db94aa490'
@@ -102,6 +104,9 @@ prepare() {
    # add upstream patch
    patch -p1 -i "${srcdir}/patch-${pkgver}"

+   # Fix old intel chipsets
+   patch -p1 < ../0001-drm-i915-Do-a-better-job-at-disabling-primary-plane-.patch
+
    # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
    # remove this when a Kconfig knob is made available by upstream
    # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
--
2.6.4