Re: [PATCH 18/41] drm/bridge: analogix_dp: Retry bridge enable when it failed

[Andrzej Hajda]

On 10.03.2017 05:32, Sean Paul wrote:
> From: zain wang 
>
> When we enable bridge failed, we have to retry it, otherwise we would get
> the abnormal display.
>
> Cc: Stéphane Marchesin 
> Signed-off-by: zain wang 
> Signed-off-by: Sean Paul 
> ---
>  drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 65 
> +-
>  drivers/gpu/drm/bridge/analogix/analogix_dp_core.h |  3 +-
>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c  |  5 +-
>  3 files changed, 56 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c 
> b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 919ae68e7670..f3eea7636a2e 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -43,8 +43,10 @@ struct bridge_init {
>   struct device_node *node;
>  };
>  
> -static void analogix_dp_init_dp(struct analogix_dp_device *dp)
> +static int analogix_dp_init_dp(struct analogix_dp_device *dp)
>  {
> + int ret;
> +
>   analogix_dp_reset(dp);
>  
>   analogix_dp_swreset(dp);
> @@ -56,10 +58,13 @@ static void analogix_dp_init_dp(struct analogix_dp_device 
> *dp)
>   analogix_dp_enable_sw_function(dp);
>  
>   analogix_dp_config_interrupt(dp);
> - analogix_dp_init_analog_func(dp);
> + ret = analogix_dp_init_analog_func(dp);
> + if (ret)
> + return ret;
>  
>   analogix_dp_init_hpd(dp);
>   analogix_dp_init_aux(dp);
> + return 0;
>  }
>  
>  static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
> @@ -925,7 +930,7 @@ static irqreturn_t analogix_dp_irq_thread(int irq, void 
> *arg)
>   return IRQ_HANDLED;
>  }
>  
> -static void analogix_dp_commit(struct analogix_dp_device *dp)
> +static int analogix_dp_commit(struct analogix_dp_device *dp)
>  {
>   int ret;
>  
> @@ -935,11 +940,10 @@ static void analogix_dp_commit(struct 
> analogix_dp_device *dp)
>   DRM_ERROR("failed to disable the panel\n");
>   }
>  
> - ret = readx_poll_timeout(analogix_dp_train_link, dp, ret, !ret, 100,
> -  DP_TIMEOUT_TRAINING_US * 5);
> + ret = analogix_dp_train_link(dp);
>   if (ret) {
>   dev_err(dp->dev, "unable to do link train, ret=%d\n", ret);
> - return;
> + return ret;
>   }
>  
>   analogix_dp_enable_scramble(dp, 1);
> @@ -960,6 +964,7 @@ static void analogix_dp_commit(struct analogix_dp_device 
> *dp)
>   dp->psr_enable = analogix_dp_detect_sink_psr(dp);
>   if (dp->psr_enable)
>   analogix_dp_enable_sink_psr(dp);
> + return 0;
>  }
>  
>  /*
> @@ -1152,12 +1157,9 @@ static void analogix_dp_bridge_pre_enable(struct 
> drm_bridge *bridge)
>   DRM_ERROR("failed to setup the panel ret = %d\n", ret);
>  }
>  
> -static void analogix_dp_bridge_enable(struct drm_bridge *bridge)
> +static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
>  {
> - struct analogix_dp_device *dp = bridge->driver_private;
> -
> - if (dp->dpms_mode == DRM_MODE_DPMS_ON)
> - return;
> + int ret;
>  
>   pm_runtime_get_sync(dp->dev);
>  
> @@ -1165,11 +1167,46 @@ static void analogix_dp_bridge_enable(struct 
> drm_bridge *bridge)
>   dp->plat_data->power_on(dp->plat_data);
>  
>   phy_power_on(dp->phy);
> - analogix_dp_init_dp(dp);
> +
> + ret = analogix_dp_init_dp(dp);
> + if (ret)
> + goto out_dp_init;
> +
> + ret = analogix_dp_commit(dp);
> + if (ret)
> + goto out_dp_init;
> +
>   enable_irq(dp->irq);
> - analogix_dp_commit(dp);
> + return 0;
>  
> - dp->dpms_mode = DRM_MODE_DPMS_ON;
> +out_dp_init:
> + phy_power_off(dp->phy);
> + if (dp->plat_data->power_off)
> + dp->plat_data->power_off(dp->plat_data);
> + pm_runtime_put_sync(dp->dev);
> +
> + return ret;
> +}
> +
> +static void analogix_dp_bridge_enable(struct drm_bridge *bridge)
> +{
> + struct analogix_dp_device *dp = bridge->driver_private;
> + int timeout_loop = 0;
> +
> + if (dp->dpms_mode == DRM_MODE_DPMS_ON)
> + return;
> +
> + while (timeout_loop < MAX_PLL_LOCK_LOOP) {

Strange name for max set bridge attempts.

Beside it:
Reviewed-by: Andrzej Hajda 
--
Regards
Andrzej

> + if (analogix_dp_set_bridge(dp) == 0) {
> + dp->dpms_mode = DRM_MODE_DPMS_ON;
> + return;
> + }
> + dev_err(dp->dev, "failed to set bridge, retry: %d\n",
> + timeout_loop);
> + timeout_loop++;
> + usleep_range(10, 11);
> + }
> + dev_err(dp->dev, "too many times retry set bridge, give it up\n");
>  }
>  
>  static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
> diff --git 

[PATCH 18/41] drm/bridge: analogix_dp: Retry bridge enable when it failed

[Sean Paul]

From: zain wang 

When we enable bridge failed, we have to retry it, otherwise we would get
the abnormal display.

Cc: Stéphane Marchesin 
Signed-off-by: zain wang 
Signed-off-by: Sean Paul 
---
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 65 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h |  3 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c  |  5 +-
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c 
b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 919ae68e7670..f3eea7636a2e 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -43,8 +43,10 @@ struct bridge_init {
struct device_node *node;
 };
 
-static void analogix_dp_init_dp(struct analogix_dp_device *dp)
+static int analogix_dp_init_dp(struct analogix_dp_device *dp)
 {
+   int ret;
+
analogix_dp_reset(dp);
 
analogix_dp_swreset(dp);
@@ -56,10 +58,13 @@ static void analogix_dp_init_dp(struct analogix_dp_device 
*dp)
analogix_dp_enable_sw_function(dp);
 
analogix_dp_config_interrupt(dp);
-   analogix_dp_init_analog_func(dp);
+   ret = analogix_dp_init_analog_func(dp);
+   if (ret)
+   return ret;
 
analogix_dp_init_hpd(dp);
analogix_dp_init_aux(dp);
+   return 0;
 }
 
 static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
@@ -925,7 +930,7 @@ static irqreturn_t analogix_dp_irq_thread(int irq, void 
*arg)
return IRQ_HANDLED;
 }
 
-static void analogix_dp_commit(struct analogix_dp_device *dp)
+static int analogix_dp_commit(struct analogix_dp_device *dp)
 {
int ret;
 
@@ -935,11 +940,10 @@ static void analogix_dp_commit(struct analogix_dp_device 
*dp)
DRM_ERROR("failed to disable the panel\n");
}
 
-   ret = readx_poll_timeout(analogix_dp_train_link, dp, ret, !ret, 100,
-DP_TIMEOUT_TRAINING_US * 5);
+   ret = analogix_dp_train_link(dp);
if (ret) {
dev_err(dp->dev, "unable to do link train, ret=%d\n", ret);
-   return;
+   return ret;
}
 
analogix_dp_enable_scramble(dp, 1);
@@ -960,6 +964,7 @@ static void analogix_dp_commit(struct analogix_dp_device 
*dp)
dp->psr_enable = analogix_dp_detect_sink_psr(dp);
if (dp->psr_enable)
analogix_dp_enable_sink_psr(dp);
+   return 0;
 }
 
 /*
@@ -1152,12 +1157,9 @@ static void analogix_dp_bridge_pre_enable(struct 
drm_bridge *bridge)
DRM_ERROR("failed to setup the panel ret = %d\n", ret);
 }
 
-static void analogix_dp_bridge_enable(struct drm_bridge *bridge)
+static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
 {
-   struct analogix_dp_device *dp = bridge->driver_private;
-
-   if (dp->dpms_mode == DRM_MODE_DPMS_ON)
-   return;
+   int ret;
 
pm_runtime_get_sync(dp->dev);
 
@@ -1165,11 +1167,46 @@ static void analogix_dp_bridge_enable(struct drm_bridge 
*bridge)
dp->plat_data->power_on(dp->plat_data);
 
phy_power_on(dp->phy);
-   analogix_dp_init_dp(dp);
+
+   ret = analogix_dp_init_dp(dp);
+   if (ret)
+   goto out_dp_init;
+
+   ret = analogix_dp_commit(dp);
+   if (ret)
+   goto out_dp_init;
+
enable_irq(dp->irq);
-   analogix_dp_commit(dp);
+   return 0;
 
-   dp->dpms_mode = DRM_MODE_DPMS_ON;
+out_dp_init:
+   phy_power_off(dp->phy);
+   if (dp->plat_data->power_off)
+   dp->plat_data->power_off(dp->plat_data);
+   pm_runtime_put_sync(dp->dev);
+
+   return ret;
+}
+
+static void analogix_dp_bridge_enable(struct drm_bridge *bridge)
+{
+   struct analogix_dp_device *dp = bridge->driver_private;
+   int timeout_loop = 0;
+
+   if (dp->dpms_mode == DRM_MODE_DPMS_ON)
+   return;
+
+   while (timeout_loop < MAX_PLL_LOCK_LOOP) {
+   if (analogix_dp_set_bridge(dp) == 0) {
+   dp->dpms_mode = DRM_MODE_DPMS_ON;
+   return;
+   }
+   dev_err(dp->dev, "failed to set bridge, retry: %d\n",
+   timeout_loop);
+   timeout_loop++;
+   usleep_range(10, 11);
+   }
+   dev_err(dp->dev, "too many times retry set bridge, give it up\n");
 }
 
 static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h 
b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
index 403ff853464b..769255dc6e99 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -19,6 +19,7 @@
 #define DP_TIMEOUT_LOOP_COUNT 100
 #define MAX_CR_LOOP 5
 #define