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

Commit b287110e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Simplify i915_gem_object_ggtt_unpin 



Split out from Chris vma-bind rework.

Jani wondered why this is save, and the reason is that i915_vma_unbind
does all these checks, too. So they're redundant.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d47c3ea2

drivers/gpu/drm/i915/i915_drv.h

+8 −2
Original line number Diff line number Diff line
@@ -2083,9 +2083,7 @@ int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj, 
				     struct i915_address_space *vm,

				     uint32_t alignment,

				     unsigned flags);

void i915_gem_object_ggtt_unpin(struct drm_i915_gem_object *obj);

int __must_check i915_vma_unbind(struct i915_vma *vma);

int __must_check i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj);

int i915_gem_object_put_pages(struct drm_i915_gem_object *obj);

void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv);

void i915_gem_release_mmap(struct drm_i915_gem_object *obj);
@@ -2290,6 +2288,14 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj, 
	return i915_gem_object_pin(obj, obj_to_ggtt(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(struct drm_i915_gem_object *obj);



/* i915_gem_context.c */

#define ctx_to_ppgtt(ctx) container_of((ctx)->vm, struct i915_hw_ppgtt, base)

int __must_check i915_gem_context_init(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem.c

+0 −20
Original line number Diff line number Diff line
@@ -2766,26 +2766,6 @@ int i915_vma_unbind(struct i915_vma *vma) 
	return 0;

}



/**

 * Unbinds an object from the global GTT aperture.

 */

int

i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)

{

	struct drm_i915_private *dev_priv = obj->base.dev->dev_private;

	struct i915_address_space *ggtt = &dev_priv->gtt.base;



	if (!i915_gem_obj_ggtt_bound(obj))

		return 0;



	if (i915_gem_obj_to_ggtt(obj)->pin_count)

		return -EBUSY;



	BUG_ON(obj->pages == NULL);



	return i915_vma_unbind(i915_gem_obj_to_vma(obj, ggtt));

}



int i915_gpu_idle(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;