浏览代码

drm/i915: remove i915_gem_object_ggtt_unbind

Only has one user and is nothing more than a shim on top of
i915_vma_unbind, so let's just get rid of it.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461842691-27575-1-git-send-email-matthew.auld@intel.com
Matthew Auld 9 年之前
父节点
当前提交
e96b7e575b
共有 2 个文件被更改,包括 1 次插入7 次删除
  1. 0 6
      drivers/gpu/drm/i915/i915_drv.h
  2. 1 1
      drivers/gpu/drm/i915/i915_gem_tiling.c

+ 0 - 6
drivers/gpu/drm/i915/i915_drv.h

@@ -3279,12 +3279,6 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj,
 				   alignment, flags | PIN_GLOBAL);
 				   alignment, flags | PIN_GLOBAL);
 }
 }
 
 
-static inline int
-i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)
-{
-	return i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
-}
-
 void i915_gem_object_ggtt_unpin_view(struct drm_i915_gem_object *obj,
 void i915_gem_object_ggtt_unpin_view(struct drm_i915_gem_object *obj,
 				     const struct i915_ggtt_view *view);
 				     const struct i915_ggtt_view *view);
 static inline void
 static inline void

+ 1 - 1
drivers/gpu/drm/i915/i915_gem_tiling.c

@@ -229,7 +229,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 		 */
 		 */
 		if (obj->map_and_fenceable &&
 		if (obj->map_and_fenceable &&
 		    !i915_gem_object_fence_ok(obj, args->tiling_mode))
 		    !i915_gem_object_fence_ok(obj, args->tiling_mode))
-			ret = i915_gem_object_ggtt_unbind(obj);
+			ret = i915_vma_unbind(i915_gem_obj_to_ggtt(obj));
 
 
 		if (ret == 0) {
 		if (ret == 0) {
 			if (obj->pages &&
 			if (obj->pages &&