--- /dev/null
+From 196f954e250943df414efd3d632254c29be38e59 Mon Sep 17 00:00:00 2001
+From: Mario Kleiner <mario.kleiner.de@gmail.com>
+Date: Wed, 6 Jul 2016 12:05:45 +0200
+Subject: drm/i915/dp: Revert "drm/i915/dp: fall back to 18 bpp when sink capability is unknown"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Mario Kleiner <mario.kleiner.de@gmail.com>
+
+commit 196f954e250943df414efd3d632254c29be38e59 upstream.
+
+This reverts commit 013dd9e03872
+("drm/i915/dp: fall back to 18 bpp when sink capability is unknown")
+
+This commit introduced a regression into stable kernels,
+as it reduces output color depth to 6 bpc for any video
+sink connected to a Displayport connector if that sink
+doesn't report a specific color depth via EDID, or if
+our EDID parser doesn't actually recognize the proper
+bpc from EDID.
+
+Affected are active DisplayPort->VGA converters and
+active DisplayPort->DVI converters. Both should be
+able to handle 8 bpc, but are degraded to 6 bpc with
+this patch.
+
+The reverted commit was meant to fix
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=105331
+
+A followup patch implements a fix for that specific bug,
+which is caused by a faulty EDID of the affected DP panel
+by adding a new EDID quirk for that panel.
+
+DP 18 bpp fallback handling and other improvements to
+DP sink bpc detection will be handled for future
+kernels in a separate series of patches.
+
+Please backport to stable.
+
+Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+Acked-by: Jani Nikula <jani.nikula@intel.com>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_display.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -11952,21 +11952,11 @@ connected_sink_compute_bpp(struct intel_
+ pipe_config->pipe_bpp = connector->base.display_info.bpc*3;
+ }
+
+- /* Clamp bpp to default limit on screens without EDID 1.4 */
+- if (connector->base.display_info.bpc == 0) {
+- int type = connector->base.connector_type;
+- int clamp_bpp = 24;
+-
+- /* Fall back to 18 bpp when DP sink capability is unknown. */
+- if (type == DRM_MODE_CONNECTOR_DisplayPort ||
+- type == DRM_MODE_CONNECTOR_eDP)
+- clamp_bpp = 18;
+-
+- if (bpp > clamp_bpp) {
+- DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of %d\n",
+- bpp, clamp_bpp);
+- pipe_config->pipe_bpp = clamp_bpp;
+- }
++ /* Clamp bpp to 8 on screens without EDID 1.4 */
++ if (connector->base.display_info.bpc == 0 && bpp > 24) {
++ DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n",
++ bpp);
++ pipe_config->pipe_bpp = 24;
+ }
+ }
+
--- /dev/null
+From a7b4667a00025ac28300737c868bd4818b6d8c4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Mon, 23 May 2016 17:42:48 +0300
+Subject: drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit a7b4667a00025ac28300737c868bd4818b6d8c4d upstream.
+
+SNB (and IVB too I suppose) starts to misbehave if the GPU gets stuck
+in an infinite batch buffer loop. The GPU apparently hogs something
+critical and CPUs start to lose interrupts and whatnot. We can keep
+the system limping along by unmasking some interrupts in
+GEN6_PMINTRMSK. The EI up interrupt has been previously chosen for
+that task, so let's never mask it.
+
+v2: s/gen6_rps_pm_mask/gen6_sanitize_rps_pm_mask/ (Chris)
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93122
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Link: http://patchwork.freedesktop.org/patch/msgid/1464014568-4529-1-git-send-email-ville.syrjala@linux.intel.com
+(cherry picked from commit 12c100bfa5d9103b6c4d43636fee09c31e75605a)
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_pm.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -4526,7 +4526,8 @@ void gen6_rps_idle(struct drm_i915_priva
+ else
+ gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
+ dev_priv->rps.last_adj = 0;
+- I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);
++ I915_WRITE(GEN6_PMINTRMSK,
++ gen6_sanitize_rps_pm_mask(dev_priv, ~0));
+ }
+ mutex_unlock(&dev_priv->rps.hw_lock);
+
projects / thirdparty / kernel / stable-queue.git / commitdiff
