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_gem.c | |
| parent | 68209390f116034449fa6a3ae03f7b100b3d894a (diff) | |
| download | talos-obmc-linux-18f23049f640e2590930c34009418c66e6ebf7b6.tar.gz talos-obmc-linux-18f23049f640e2590930c34009418c66e6ebf7b6.zip | |
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_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 444d0b5680f5..c05fc1d0dce7 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -408,7 +408,7 @@ fail: return ret; } -void *msm_gem_vaddr_locked(struct drm_gem_object *obj) +void *msm_gem_get_vaddr_locked(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj = to_msm_bo(obj); WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex)); @@ -424,15 +424,26 @@ void *msm_gem_vaddr_locked(struct drm_gem_object *obj) return msm_obj->vaddr; } -void *msm_gem_vaddr(struct drm_gem_object *obj) +void *msm_gem_get_vaddr(struct drm_gem_object *obj) { void *ret; mutex_lock(&obj->dev->struct_mutex); - ret = msm_gem_vaddr_locked(obj); + ret = msm_gem_get_vaddr_locked(obj); mutex_unlock(&obj->dev->struct_mutex); return ret; } +void msm_gem_put_vaddr_locked(struct drm_gem_object *obj) +{ + WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex)); + /* no-op for now */ +} + +void msm_gem_put_vaddr(struct drm_gem_object *obj) +{ + /* no-op for now */ +} + /* Update madvise status, returns true if not purged, else * false or -errno. */ |
