[PATCH 1/2] Revert "drm/i915: Explain the magic numbers for AUX SYNC/precharge length"

[Swati Sharma]

This reverts commit 26bfc3f36f2104c174dfc72415547d5c28ef3f1c.

Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_aux.c | 32 ++-------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c
index abf77ba76972..05b35adae952 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_aux.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c
@@ -119,32 +119,6 @@ static u32 skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
 	return index ? 0 : 1;
 }
 
-static int intel_dp_aux_sync_len(void)
-{
-	int precharge = 16; /* 10-16 */
-	int preamble = 16;
-
-	return precharge + preamble;
-}
-
-static int intel_dp_aux_fw_sync_len(void)
-{
-	int precharge = 16; /* 10-16 */
-	int preamble = 8;
-
-	return precharge + preamble;
-}
-
-static int g4x_dp_aux_precharge_len(void)
-{
-	int precharge_min = 10;
-	int preamble = 16;
-
-	/* HW wants the length of the extra precharge in 2us units */
-	return (intel_dp_aux_sync_len() -
-		precharge_min - preamble) / 2;
-}
-
 static u32 g4x_get_aux_send_ctl(struct intel_dp *intel_dp,
 				int send_bytes,
 				u32 aux_clock_divider)
@@ -167,7 +141,7 @@ static u32 g4x_get_aux_send_ctl(struct intel_dp *intel_dp,
 	       timeout |
 	       DP_AUX_CH_CTL_RECEIVE_ERROR |
 	       (send_bytes << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
-	       (g4x_dp_aux_precharge_len() << DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT) |
+	       (3 << DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT) |
 	       (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT);
 }
 
@@ -191,8 +165,8 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
 	      DP_AUX_CH_CTL_TIME_OUT_MAX |
 	      DP_AUX_CH_CTL_RECEIVE_ERROR |
 	      (send_bytes << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
-	      DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(intel_dp_aux_fw_sync_len()) |
-	      DP_AUX_CH_CTL_SYNC_PULSE_SKL(intel_dp_aux_sync_len());
+	      DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(24) |
+	      DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);
 
 	if (intel_tc_port_in_tbt_alt_mode(dig_port))
 		ret |= DP_AUX_CH_CTL_TBT_IO;
-- 
2.25.1