Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e96b7e57 authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

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: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461842691-27575-1-git-send-email-matthew.auld@intel.com
parent 7d993739

drivers/gpu/drm/i915/i915_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -3279,12 +3279,6 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj, 
				   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,

				     const struct i915_ggtt_view *view);

static inline void

drivers/gpu/drm/i915/i915_gem_tiling.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
		 */

		if (obj->map_and_fenceable &&

		    !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 (obj->pages &&