]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
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)
committerJiri Slaby <jslaby@suse.cz>
Wed, 5 Mar 2014 16:13:57 +0000 (17:13 +0100)
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: Jiri Slaby <jslaby@suse.cz>
drivers/gpu/drm/i915/intel_dp.c

index 5a97f7356843ead67c09c22e61f82b09de3d8279..e5c79ae1614bb250e68f1039ea96e2b05360e62c 100644 (file)
@@ -467,7 +467,7 @@ intel_dp_aux_native_write(struct intel_dp *intel_dp,
                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;
        }
@@ -516,7 +516,7 @@ intel_dp_aux_native_read(struct intel_dp *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;
        }