From a9203c936d1980ffaa140f28a99bf34637cc2ce3 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Wed, 29 Mar 2017 07:59:55 -0600 Subject: drm/msm: Remove ringbuffer restriction from idle Remove the check in a5xx_idle() to see if idle is being called on the current ring. a5xx_idle() is to used make sure the commands in the specified ring have completed and it is entirely reasonably to expect that a ring switch might need to be executed first. Change-Id: Ic0dedbadf45c7f624093efae72f3a9d75dc6857d Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index f5847bc60c49..b5140d2c772a 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -856,14 +856,6 @@ static inline bool _a5xx_check_idle(struct msm_gpu *gpu) bool a5xx_idle(struct msm_gpu *gpu, struct msm_ringbuffer *ring) { - struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); - struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu); - - if (ring != a5xx_gpu->cur_ring) { - WARN(1, "Tried to idle a non-current ringbuffer\n"); - return false; - } - /* wait for CP to drain ringbuffer: */ if (!adreno_idle(gpu, ring)) return false; -- cgit v1.2.3