diff mbox series

[9/9] drm/msm/dpu: Fix timeout issues on command mode panels

Message ID 20210109133736.143469-10-angelogioacchino.delregno@somainline.org
State Superseded
Headers show
Series Qualcomm DRM DPU fixes | expand

Commit Message

AngeloGioacchino Del Regno Jan. 9, 2021, 1:37 p.m. UTC
In function dpu_encoder_phys_cmd_wait_for_commit_done we are always
checking if the relative CTL is started by waiting for an interrupt
to fire: it is fine to do that, but then sometimes we call this
function while the CTL is up and has never been put down, but that
interrupt gets raised only when the CTL gets a state change from
0 to 1 (disabled to enabled), so we're going to wait for something
that will never happen on its own.

Solving this while avoiding to restart the CTL is actually possible
and can be done by just checking if it is already up and running
when the wait_for_commit_done function is called: in this case, so,
if the CTL was already running, we can say that the commit is done
if the command transmission is complete (in other terms, if the
interface has been flushed).

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

AngeloGioacchino Del Regno Jan. 12, 2021, 6:02 p.m. UTC | #1
Il 09/01/21 14:37, AngeloGioacchino Del Regno ha scritto:
> In function dpu_encoder_phys_cmd_wait_for_commit_done we are always

> checking if the relative CTL is started by waiting for an interrupt

> to fire: it is fine to do that, but then sometimes we call this

> function while the CTL is up and has never been put down, but that

> interrupt gets raised only when the CTL gets a state change from

> 0 to 1 (disabled to enabled), so we're going to wait for something

> that will never happen on its own.

> 

> Solving this while avoiding to restart the CTL is actually possible

> and can be done by just checking if it is already up and running

> when the wait_for_commit_done function is called: in this case, so,

> if the CTL was already running, we can say that the commit is done

> if the command transmission is complete (in other terms, if the

> interface has been flushed).

> 

> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>

> ---

>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 +++

>   1 file changed, 3 insertions(+)

> 

> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

> index 2311e98480b9..0624864da343 100644

> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

> @@ -695,6 +695,9 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(

>   	if (!dpu_encoder_phys_cmd_is_master(phys_enc))

>   		return 0;

>   

> +	if (phys_enc->hw_ctl->ops.is_started)

> +		return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);

> +

>   	return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);

>   }

>   

> 


Sorry, this patch is obviously faulty, Took it from the wrong local 
tree. I will send a V2.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 2311e98480b9..0624864da343 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -695,6 +695,9 @@  static int dpu_encoder_phys_cmd_wait_for_commit_done(
 	if (!dpu_encoder_phys_cmd_is_master(phys_enc))
 		return 0;
 
+	if (phys_enc->hw_ctl->ops.is_started)
+		return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
+
 	return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
 }