diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-30 15:31:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-30 15:31:40 -0700 |
| commit | 92124c76a2bd3e0c1d98de91d09199558117a1a9 (patch) | |
| tree | 96665ee0207e0211a5a4ae7a67ffed9efcba4411 | |
| parent | 2146eb6702c3819eef4203b6d740185045897965 (diff) | |
| parent | a9203c936d1980ffaa140f28a99bf34637cc2ce3 (diff) | |
Merge "drm/msm: Remove ringbuffer restriction from idle"
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 |
1 files changed, 0 insertions, 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; |