Merge tag 'drm-msm-fixes-2021-04-02' into msm-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dp / dp_aux.c

diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c
index 19b35ae..7c22bfe 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_aux.c
+++ b/drivers/gpu/drm/msm/dp/dp_aux.c
@@ -32,6 +32,8 @@ struct dp_aux_private {
        struct drm_dp_aux dp_aux;
 };
 
+#define MAX_AUX_RETRIES                        5
+
 static const char *dp_aux_get_error(u32 aux_error)
 {
        switch (aux_error) {
@@ -336,7 +338,6 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,
        ssize_t ret;
        int const aux_cmd_native_max = 16;
        int const aux_cmd_i2c_max = 128;
-       int const retry_count = 5;
        struct dp_aux_private *aux = container_of(dp_aux,
                struct dp_aux_private, dp_aux);
 
@@ -380,9 +381,8 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,
        if (ret < 0) {
                if (aux->native) {
                        aux->retry_cnt++;
-                       if (!(aux->retry_cnt % retry_count))
+                       if (!(aux->retry_cnt % MAX_AUX_RETRIES))
                                dp_catalog_aux_update_cfg(aux->catalog);
-                       dp_catalog_aux_reset(aux->catalog);
                }
                usleep_range(400, 500); /* at least 400us to next try */
                goto unlock_exit;