2019-05-08 13:06:54

by Wen He

Subject: [v1] drm/arm/mali-dp: Add a loop around the second set CVAL and try 5 times

This patch trying to fix monitor freeze issue caused by drm error
'flip_done timed out' on LS1028A platform. this set try is make a loop
around the second setting CVAL and try like 5 times before giveing up.

Signed-off-by: Liviu <[email protected]>
Signed-off-by: Wen He <[email protected]>
---
drivers/gpu/drm/arm/malidp_drv.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 21725c9b9f5e..18cb7f134f4e 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -192,6 +192,7 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
{
struct drm_device *drm = state->dev;
struct malidp_drm *malidp = drm->dev_private;
+ int loop = 5;

malidp->event = malidp->crtc.state->event;
malidp->crtc.state->event = NULL;
@@ -206,8 +207,18 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
drm_crtc_vblank_get(&malidp->crtc);

/* only set config_valid if the CRTC is enabled */
- if (malidp_set_and_wait_config_valid(drm) < 0)
+ if (malidp_set_and_wait_config_valid(drm) < 0) {
+ /*
+ * make a loop around the second CVAL setting and
+ * try 5 times before giving up.
+ */
+ while (loop--) {
+ if (!malidp_set_and_wait_config_valid(drm))
+ break;
+ }
DRM_DEBUG_DRIVER("timed out waiting for updated configuration\n");
+ }
+
} else if (malidp->event) {
/* CRTC inactive means vblank IRQ is disabled, send event directly */
spin_lock_irq(&drm->event_lock);
--
2.17.1

2019-05-09 15:28:46

by Liviu Dudau

Subject: Re: [v1] drm/arm/mali-dp: Add a loop around the second set CVAL and try 5 times

On Wed, May 08, 2019 at 10:58:18AM +0000, Wen He wrote:
> This patch trying to fix monitor freeze issue caused by drm error
> 'flip_done timed out' on LS1028A platform. this set try is make a loop
> around the second setting CVAL and try like 5 times before giveing up.
>
> Signed-off-by: Liviu <[email protected]>
> Signed-off-by: Wen He <[email protected]>

Acked-by: Liviu Dudau <[email protected]>

I will pull this into my mali-dp tree and send it as fixes after v5.2-rc1.

Best regards,
Liviu

> ---
> drivers/gpu/drm/arm/malidp_drv.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> index 21725c9b9f5e..18cb7f134f4e 100644
> --- a/drivers/gpu/drm/arm/malidp_drv.c
> +++ b/drivers/gpu/drm/arm/malidp_drv.c
> @@ -192,6 +192,7 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
> {
> struct drm_device *drm = state->dev;
> struct malidp_drm *malidp = drm->dev_private;
> + int loop = 5;
>
> malidp->event = malidp->crtc.state->event;
> malidp->crtc.state->event = NULL;
> @@ -206,8 +207,18 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
> drm_crtc_vblank_get(&malidp->crtc);
>
> /* only set config_valid if the CRTC is enabled */
> - if (malidp_set_and_wait_config_valid(drm) < 0)
> + if (malidp_set_and_wait_config_valid(drm) < 0) {
> + /*
> + * make a loop around the second CVAL setting and
> + * try 5 times before giving up.
> + */
> + while (loop--) {
> + if (!malidp_set_and_wait_config_valid(drm))
> + break;
> + }
> DRM_DEBUG_DRIVER("timed out waiting for updated configuration\n");
> + }
> +
> } else if (malidp->event) {
> /* CRTC inactive means vblank IRQ is disabled, send event directly */
> spin_lock_irq(&drm->event_lock);
> --
> 2.17.1
>

--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯