diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:29:40 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:29:40 +0200 |
commit | 0ba78a95a6629975ff16545ae868fa1bb38f786a (patch) | |
tree | bb51f571bb187bc10f3a9639789afd4cf49b5b27 /drivers/gpu/drm/msm/msm_gpu.c | |
parent | def34eaae5ce04b324e48e1bfac873091d945213 (diff) | |
parent | a232591ba289a1a397e0005c9f276a126c1bc1b1 (diff) |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 99e05aacbee1..af5b6ba4095b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -706,9 +706,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) msm_ringbuffer_destroy(gpu->rb); } - if (gpu->aspace) - msm_gem_address_space_destroy(gpu->aspace); - if (gpu->fctx) msm_fence_context_free(gpu->fctx); } |