aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-02-11 04:52:04 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-02-13 10:05:33 -0500
commit04eada25d1f72efdecd32d702706594f81de65d5 (patch)
tree090f09ba00b3485568886056316eb8714accacf0 /drivers/gpu
parentf66fab8e1cd6b3127ba4c5c0d11539fbe1de1e36 (diff)
drm/i915/dp: increase native aux defer retry timeout
Give more slack to sink devices before retrying on native aux defer. AFAICT the 100 us timeout was not based on the DP spec. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Cc: stable@vger.kernel.org (on Jani's request) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2f517b85b3f4..c36960488c89 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -556,7 +556,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
556 if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_ACK) 556 if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_ACK)
557 break; 557 break;
558 else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER) 558 else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)
559 udelay(100); 559 usleep_range(400, 500);
560 else 560 else
561 return -EIO; 561 return -EIO;
562 } 562 }
@@ -608,7 +608,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,
608 return ret - 1; 608 return ret - 1;
609 } 609 }
610 else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER) 610 else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)
611 udelay(100); 611 usleep_range(400, 500);
612 else 612 else
613 return -EIO; 613 return -EIO;
614 } 614 }