From: James Ausmus <james.ausmus@intel.com>
Date: Thu, 12 Oct 2017 21:30:37 +0000 (-0700)
Subject: drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
X-Git-Tag: v4.15-rc1~90^2~10^2~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f5f63d558b979402ae48f3df2f7bc3589531e28;p=thirdparty%2Fkernel%2Flinux.git

drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting

Per BSpec, 400us is "BDW+ Do not use this setting." - not just PORT_A.
Set BDW to 600us unconditionally.

v2:
-Split in to two patches (Rodrigo)

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: James Ausmus <james.ausmus@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171012213037.4245-2-james.ausmus@intel.com
---

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3f0d37fa833f2..4b65cf137f796 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1007,7 +1007,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,
 	else
 		precharge = 5;
 
-	if (IS_BROADWELL(dev_priv) && intel_dig_port->port == PORT_A)
+	if (IS_BROADWELL(dev_priv))
 		timeout = DP_AUX_CH_CTL_TIME_OUT_600us;
 	else
 		timeout = DP_AUX_CH_CTL_TIME_OUT_400us;