| From 04eada25d1f72efdecd32d702706594f81de65d5 Mon Sep 17 00:00:00 2001 |
| From: Jani Nikula <jani.nikula@intel.com> |
| Date: Tue, 11 Feb 2014 11:52:04 +0200 |
| Subject: drm/i915/dp: increase native aux defer retry timeout |
| |
| From: Jani Nikula <jani.nikula@intel.com> |
| |
| commit 04eada25d1f72efdecd32d702706594f81de65d5 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/intel_dp.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_dp.c |
| +++ b/drivers/gpu/drm/i915/intel_dp.c |
| @@ -555,7 +555,7 @@ intel_dp_aux_native_write(struct intel_d |
| if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK) |
| break; |
| else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER) |
| - udelay(100); |
| + usleep_range(400, 500); |
| else |
| return -EIO; |
| } |
| @@ -607,7 +607,7 @@ intel_dp_aux_native_read(struct intel_dp |
| return ret - 1; |
| } |
| else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER) |
| - udelay(100); |
| + usleep_range(400, 500); |
| else |
| return -EIO; |
| } |
