diff mbox

drm/i915: dp: increase probe retries

Message ID 1375792824-16013-1-git-send-email-tiwai@suse.de (mailing list archive)
State New, archived
Headers show

Commit Message

Takashi Iwai Aug. 6, 2013, 12:40 p.m. UTC
We've seen a problem that the DP port on a docking station is often
not detected properly or misconfigured (no proper native modes) with a
Haswell-based laptop.  The trace showed that the driver gave up or got
only insufficient EDID, maybe due to some unstable aux communication.

As a band-aid fix, increase the number of retries from 5 to 10.
This seems enough for our cases.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/gpu/drm/i915/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson Aug. 6, 2013, 12:51 p.m. UTC | #1
On Tue, Aug 06, 2013 at 02:40:24PM +0200, Takashi Iwai wrote:
> We've seen a problem that the DP port on a docking station is often
> not detected properly or misconfigured (no proper native modes) with a
> Haswell-based laptop.  The trace showed that the driver gave up or got
> only insufficient EDID, maybe due to some unstable aux communication.
> 
> As a band-aid fix, increase the number of retries from 5 to 10.
> This seems enough for our cases.

Did you test with

commit bc86625a4ff7574d4d4dba79723457711eb784e0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Sun Jul 21 16:00:03 2013 +0100

    drm/i915: Retry DP aux_ch communications with a different clock after failures

That sounds like a relevant workaround.
-Chris
Takashi Iwai Aug. 6, 2013, 2 p.m. UTC | #2
At Tue, 6 Aug 2013 13:51:32 +0100,
Chris Wilson wrote:
> 
> On Tue, Aug 06, 2013 at 02:40:24PM +0200, Takashi Iwai wrote:
> > We've seen a problem that the DP port on a docking station is often
> > not detected properly or misconfigured (no proper native modes) with a
> > Haswell-based laptop.  The trace showed that the driver gave up or got
> > only insufficient EDID, maybe due to some unstable aux communication.
> > 
> > As a band-aid fix, increase the number of retries from 5 to 10.
> > This seems enough for our cases.
> 
> Did you test with
> 
> commit bc86625a4ff7574d4d4dba79723457711eb784e0
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date:   Sun Jul 21 16:00:03 2013 +0100
> 
>     drm/i915: Retry DP aux_ch communications with a different clock after failures
> 
> That sounds like a relevant workaround.

This seems also stabilizing the DP detection.
Will check more and give back if I still encounter a problem.


Thanks!

Takashi
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 26e162b..8491830 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -548,7 +548,7 @@  intel_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
 		break;
 	}
 
-	for (retry = 0; retry < 5; retry++) {
+	for (retry = 0; retry < 10; retry++) {
 		ret = intel_dp_aux_ch(intel_dp,
 				      msg, msg_bytes,
 				      reply, reply_bytes);