---

yaml --- r: 311033 b: refs/heads/master c: 6b4e0a9 h: refs/heads/master i: 311031: 7858d87 v: v3
git-mirror · Jun 16, 2012 · b7d95be · b7d95be
1 parent bd8b71e
commit b7d95be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1
+refs/heads/master: 6b4e0a93ff6e45714c72bdce193f719ed94810e3
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -371,7 +371,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
 	int recv_bytes;
 	uint32_t status;
 	uint32_t aux_clock_divider;
-	int try, precharge = 5;
+	int try, precharge;
 
 	intel_dp_check_edp(intel_dp);
 	/* The clock divider is based off the hrawclk,
@@ -391,6 +391,11 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
 	else
 		aux_clock_divider = intel_hrawclk(dev) / 2;
 
+	if (IS_GEN6(dev))
+		precharge = 3;
+	else
+		precharge = 5;
+
 	/* Try to wait for any previous AUX channel activity */
 	for (try = 0; try < 3; try++) {
 		status = I915_READ(ch_ctl);