[PATCH 5/8] drm/i915: Avoid EBUSY retry on intel_dp_aux_ch.

[Rodrigo Vivi]

EBUSY retries are already in place at drm level.
We don't need to replicate the job here.

v2: rebase on top of EAGAIN x EBUSY retries change at drm.
    EBUSY retry at DRM is now handling the msleep(1).

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index ed07f0a..a8ba243 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -817,25 +817,9 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,

        intel_dp_check_edp(intel_dp);

-       /* Try to wait for any previous AUX channel activity */
-       for (try = 0; try < 3; try++) {
-               status = I915_READ_NOTRACE(ch_ctl);
-               if ((status & DP_AUX_CH_CTL_SEND_BUSY) == 0)
-                       break;
-               msleep(1);
-       }
-
-       if (try == 3) {
-               static u32 last_status = -1;
-               const u32 status = I915_READ(ch_ctl);
-
-               if (status != last_status) {
-                       WARN(1, "dp_aux_ch not started status 0x%08x\n",
-                            status);
-                       last_status = status;
-               }
-
-               ret = -EAGAIN;
+       status = I915_READ_NOTRACE(ch_ctl);
+       if ((status & DP_AUX_CH_CTL_SEND_BUSY) != 0) {
+               ret = -EBUSY;
                goto out;
        }

-- 
2.4.3