drm/msm/a6xx: Clear shadow on suspend
Subsystems (4)
PATCH 1/2 drm/msm/a6xx: Clear shadow on suspend
From: Rob Clark <[email protected]>
Clear the shadow rptr on suspend. Otherwise, when we resume, we can have a stale value until CP_WHERE_AM_I executes. If we suspend near the ringbuffer wraparound point, this can lead to a chicken/egg situation where we are waiting for ringbuffer space to write the CP_WHERE_AM_I (or CP_INIT) packet, because we mistakenly believe that the ringbuffer is full (due to stale rptr value in the shadow).
Fixes errors like:
[drm:adreno_wait_ring [msm]] *ERROR* timeout waiting for space in ringbuffer 0
in the resume path.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +10 -1
@@ -1043,12 +1043,21 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +int i, ret;trace_msm_gpu_suspend (0 );devfreq_suspend_device (gpu->devfreq.devfreq); -return a6xx_gmu_stop (a6xx_gpu); + ret =a6xx_gmu_stop (a6xx_gpu); +if (ret) +return ret; + +if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) +for (i =0 ; i < gpu->nr_rings; i++) + a6xx_gpu->shadow[i] =0 ; + +return 0 ; }static int a6xx_get_timestamp (struct msm_gpu *gpu,uint64_t *value)
Signature · 1 line
2.28.0
PATCH 2/2 drm/msm/a5xx: Clear shadow on suspend
From: Rob Clark <[email protected]>
Similar to the previous patch, clear shadow on suspend to avoid timeouts waiting for ringbuffer space.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +11 -1
@@ -1206,7 +1206,9 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)static int a5xx_pm_suspend (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a5xx_gpu *a5xx_gpu =to_a5xx_gpu (adreno_gpu);u32 mask =0xf ; +int i, ret;/* A510 has 3 XIN ports in VBIF */ if (adreno_is_a510 (adreno_gpu))
@@ -1226,7 +1228,15 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 );gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); -return msm_gpu_pm_suspend (gpu); + ret =msm_gpu_pm_suspend (gpu); +if (ret) +return ret; + +if (a5xx_gpu->has_whereami) +for (i =0 ; i < gpu->nr_rings; i++) + a5xx_gpu->shadow[i] =0 ; + +return 0 ; }static int a5xx_get_timestamp (struct msm_gpu *gpu,uint64_t *value)
Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
Clear the shadow rptr on suspend. Otherwise, when we resume, we can have a stale value until
CP_WHERE_AM_Iexecutes. If we suspend near the ringbuffer wraparound point, this can lead to a chicken/egg situation where we are waiting for ringbuffer space to write theCP_WHERE_AM_I(orCP_INIT) packet, because we mistakenly believe that the ringbuffer is full (due to stale rptr value in the shadow).
Quoted 8 lines
Fixes errors like:
[drm:adreno_wait_ring [msm]] *ERROR* timeout waiting for space in ringbuffer 0
in the resume path.
Fixes d3a569fccfa0 ("drm/msm: a6xx: Use WHERE_AM_I for eligible targets")Signed-off-by Rob Clark <[email protected]>
Quoted 34 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/adreno/a6xx_gpu.c +10
-1@@ -1043,12 +1043,21 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +int i, ret;trace_msm_gpu_suspend (0 );devfreq_suspend_device (gpu->devfreq.devfreq); -return a6xx_gmu_stop (a6xx_gpu); + ret =a6xx_gmu_stop (a6xx_gpu); +if (ret) +return ret; + +if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) +for (i =0 ; i < gpu->nr_rings; i++) + a6xx_gpu->shadow[i] =0 ; + +return 0 ; }static int a6xx_get_timestamp (struct msm_gpu *gpu,uint64_t *value)Signature · 1 line
2.28.0
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/msm/a5xx: Clear shadow on suspend
In reply to Rob ClarkQuoted 7 lines · Rob Clark
From: Rob Clark <[email protected]>
Similar to the previous patch, clear shadow on suspend to avoid timeouts waiting for ringbuffer space.
Fixes 8907afb476ac ("drm/msm: Allow a5xx to mark the RPTR shadow as privileged")Signed-off-by Rob Clark <[email protected]>
Quoted 38 lines
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +11
-1@@ -1206,7 +1206,9 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)static int a5xx_pm_suspend (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a5xx_gpu *a5xx_gpu =to_a5xx_gpu (adreno_gpu);u32 mask =0xf ; +int i, ret;/* A510 has 3 XIN ports in VBIF */ if (adreno_is_a510 (adreno_gpu))@@ -1226,7 +1228,15 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x003C0000 );gpu_write (gpu,REG_A5XX_RBBM_BLOCK_SW_RESET_CMD ,0x00000000 ); -return msm_gpu_pm_suspend (gpu); + ret =msm_gpu_pm_suspend (gpu); +if (ret) +return ret; + +if (a5xx_gpu->has_whereami) +for (i =0 ; i < gpu->nr_rings; i++) + a5xx_gpu->shadow[i] =0 ; + +return 0 ; }static int a5xx_get_timestamp (struct msm_gpu *gpu,uint64_t *value)Signature · 1 line
2.28.0
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 10 lines · On Tue, 10 Nov 2020 10:43:59 -0800 you wrote:
From: Rob Clark <[email protected]>
Clear the shadow rptr on suspend. Otherwise, when we resume, we can have a stale value until
CP_WHERE_AM_Iexecutes. If we suspend near the ringbuffer wraparound point, this can lead to a chicken/egg situation where we are waiting for ringbuffer space to write theCP_WHERE_AM_I(orCP_INIT) packet, because we mistakenly believe that the ringbuffer is full (due to stale rptr value in the shadow).[...]
Here is the summary with links:
- [1/2] drm/msm/a6xx: Clear shadow on suspend
https://git.kernel.org/qcom/c/e8b0b994c3a5 - [2/2] drm/msm/a5xx: Clear shadow on suspend https://git.kernel.org/qcom/c/5771de5d5b3b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html