drm/i915/dp: increase native aux defer retry timeout
authorJani Nikula <jani.nikula@intel.com>
Tue, 11 Feb 2014 09:52:04 +0000 (11:52 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 13 Feb 2014 15:05:33 +0000 (16:05 +0100)
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>
drivers/gpu/drm/i915/intel_dp.c

index 2f517b8..c369604 100644 (file)
@@ -556,7 +556,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
                if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_ACK)
                        break;
                else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)
-                       udelay(100);
+                       usleep_range(400, 500);
                else
                        return -EIO;
        }
@@ -608,7 +608,7 @@ intel_dp_aux_native_read(struct intel_dp *intel_dp,
                        return ret - 1;
                }
                else if ((ack & DP_AUX_NATIVE_REPLY_MASK) == DP_AUX_NATIVE_REPLY_DEFER)
-                       udelay(100);
+                       usleep_range(400, 500);
                else
                        return -EIO;
        }