Without that runtime suspend is often blocked due to
etnaviv_gpu_rpm_suspend() returning -EBUSY since the FE seems to trigger
the MC in its idle loop.

Ignoring the MC bit makes the GPU suspend as expected. This was tested
on GC7000.

Signed-off-by: Guido Günther <a...@sigxcpu.org>
---
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c 
b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 187de610b325..da24e433f82a 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1820,8 +1820,9 @@ static int etnaviv_gpu_rpm_suspend(struct device *dev)
        if (atomic_read(&gpu->sched.hw_rq_count))
                return -EBUSY;
 
-       /* Check whether the hardware (except FE) is idle */
-       mask = gpu->idle_mask & ~VIVS_HI_IDLE_STATE_FE;
+       /* Check whether the hardware (except FE and MC) is idle */
+       mask = gpu->idle_mask & ~(VIVS_HI_IDLE_STATE_FE |
+                                 VIVS_HI_IDLE_STATE_MC);
        idle = gpu_read(gpu, VIVS_HI_IDLE_STATE) & mask;
        if (idle != mask)
                return -EBUSY;
-- 
2.23.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to