diff options
author | Rob Clark <robdclark@gmail.com> | 2016-05-26 16:24:35 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2016-07-16 10:09:07 -0400 |
commit | 18f23049f640e2590930c34009418c66e6ebf7b6 (patch) | |
tree | 294d1310496395f435e876632439b752c234d75c /drivers/gpu/drm/msm/msm_ringbuffer.c | |
parent | 68209390f116034449fa6a3ae03f7b100b3d894a (diff) |
drm/msm: change gem->vmap() to get/put
Before we can add vmap shrinking, we really need to know which vmap'ings
are currently being used. So switch to get/put interface. Stubbed put
fxns for now.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_ringbuffer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 42f5359cf988..f326cf6a32e6 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c | |||
@@ -39,7 +39,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size) | |||
39 | goto fail; | 39 | goto fail; |
40 | } | 40 | } |
41 | 41 | ||
42 | ring->start = msm_gem_vaddr_locked(ring->bo); | 42 | ring->start = msm_gem_get_vaddr_locked(ring->bo); |
43 | if (IS_ERR(ring->start)) { | 43 | if (IS_ERR(ring->start)) { |
44 | ret = PTR_ERR(ring->start); | 44 | ret = PTR_ERR(ring->start); |
45 | goto fail; | 45 | goto fail; |
@@ -59,7 +59,9 @@ fail: | |||
59 | 59 | ||
60 | void msm_ringbuffer_destroy(struct msm_ringbuffer *ring) | 60 | void msm_ringbuffer_destroy(struct msm_ringbuffer *ring) |
61 | { | 61 | { |
62 | if (ring->bo) | 62 | if (ring->bo) { |
63 | msm_gem_put_vaddr(ring->bo); | ||
63 | drm_gem_object_unreference_unlocked(ring->bo); | 64 | drm_gem_object_unreference_unlocked(ring->bo); |
65 | } | ||
64 | kfree(ring); | 66 | kfree(ring); |
65 | } | 67 | } |