Merge tag 'drm-intel-next-2017-05-29' of git://anongit.freedesktop.org/git/drm-intel...

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_hdmi.c

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index c6b8207724fadf64d7c58e7ed8ec8fb3c8284c70..58d690393b294b3f2b71ef6a004b14819dfe5b91 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1327,6 +1327,11 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state)
                        return false;
        }
 
+       /* Display Wa #1139 */
+       if (IS_GLK_REVID(dev_priv, 0, GLK_REVID_A1) &&
+           crtc_state->base.adjusted_mode.htotal > 5460)
+               return false;
+
        return true;
 }
 
@@ -1392,7 +1397,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
        }
 
        if (!pipe_config->bw_constrained) {
-               DRM_DEBUG_KMS("forcing pipe bpc to %i for HDMI\n", desired_bpp);
+               DRM_DEBUG_KMS("forcing pipe bpp to %i for HDMI\n", desired_bpp);
                pipe_config->pipe_bpp = desired_bpp;
        }