diff options
| author | Guido Günther <agx@sigxcpu.org> | 2020-03-02 20:13:35 +0100 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2020-03-03 10:58:57 +0100 |
| commit | 1a910c11d35bfacb68a3e650fbc087491e92661f (patch) | |
| tree | 1c2d520ccf4881f8ace563dc81c56b3ebb0a37c3 | |
| parent | b170455120b6a465d2b424562cafaad4a7ac94c1 (diff) | |
| download | linux-1a910c11d35bfacb68a3e650fbc087491e92661f.tar.gz linux-1a910c11d35bfacb68a3e650fbc087491e92661f.tar.xz | |
drm/etnaviv: Ignore MC when checking runtime suspend idleness
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 <agx@sigxcpu.org>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 52473bec330a..26fe34086a60 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1835,8 +1835,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; |