diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2014-02-04 15:48:59 +0000 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2014-02-08 13:14:51 -0800 |
| commit | 47a8cbcb63518cb007d1b291a0d9168fe4aed7a2 (patch) | |
| tree | 2075aa686f9f214a1f91782c1d033dba9c30af86 | |
| parent | bbd041a882253d98b470baaebf66022a7e19e924 (diff) | |
drm/i915: Rename prepare|finish_gtt
We have some other upcoming uses with big pages, and it makes more sense
to pass in the VMA instead of the object.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d7c4718bd65a..1edaa41f9eae 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2347,8 +2347,8 @@ int i915_gem_evict_everything(struct drm_device *dev); void i915_check_and_clear_faults(struct drm_device *dev); void i915_gem_suspend_gtt_mappings(struct drm_device *dev); void i915_gem_restore_gtt_mappings(struct drm_device *dev); -int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj); -void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj); +int __must_check i915_gem_vm_prepare_vma(struct i915_vma *vma); +void i915_gem_vm_finish_vma(struct i915_vma *vma); void i915_gem_init_global_gtt(struct drm_device *dev); void i915_gem_setup_global_gtt(struct drm_device *dev, unsigned long start, unsigned long mappable_end, unsigned long end); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 93cab6d23b7d..897747cdc04c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2743,7 +2743,7 @@ int i915_vma_unbind(struct i915_vma *vma) vma->unbind_vma(vma); - i915_gem_gtt_finish_object(obj); + i915_gem_vm_finish_vma(vma); list_del(&vma->mm_list); /* Avoid an unnecessary call to unbind on rebind. */ @@ -3289,7 +3289,7 @@ search_free: goto err_remove_node; } - ret = i915_gem_gtt_prepare_object(obj); + ret = i915_gem_vm_prepare_vma(vma); if (ret) goto err_remove_node; diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 1e9d9ab26ed8..4b369a19ba7d 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1144,8 +1144,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) i915_gem_chipset_flush(dev); } -int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj) +int i915_gem_vm_prepare_vma(struct i915_vma *vma) { + struct drm_i915_gem_object *obj = vma->obj; + if (obj->has_dma_mapping) return 0; @@ -1390,8 +1392,9 @@ static void ggtt_unbind_vma(struct i915_vma *vma) } } -void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj) +void i915_gem_vm_finish_vma(struct i915_vma *vma) { + struct drm_i915_gem_object *obj = vma->obj; struct drm_device *dev = obj->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; bool interruptible; |