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

Commit 321f2ada authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Move ppgtt_release out of the header 



At one time it was expected to be called in multiple places by kref_put.
At the current time however, it is all contained within
i915_gem_context.c.

This patch makes an upcoming required addition a bit nicer since it too
doesn't need to be defined in a header file.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c5c98a58

drivers/gpu/drm/i915/i915_drv.h

+0 −36
Original line number Diff line number Diff line
@@ -2379,42 +2379,6 @@ static inline bool intel_enable_ppgtt(struct drm_device *dev, bool full) 
		return HAS_ALIASING_PPGTT(dev);

}



static inline void ppgtt_release(struct kref *kref)

{

	struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);

	struct drm_device *dev = ppgtt->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct i915_address_space *vm = &ppgtt->base;



	if (ppgtt == dev_priv->mm.aliasing_ppgtt ||

	    (list_empty(&vm->active_list) && list_empty(&vm->inactive_list))) {

		ppgtt->base.cleanup(&ppgtt->base);

		return;

	}



	/*

	 * Make sure vmas are unbound before we take down the drm_mm

	 *

	 * FIXME: Proper refcounting should take care of this, this shouldn't be

	 * needed at all.

	 */

	if (!list_empty(&vm->active_list)) {

		struct i915_vma *vma;



		list_for_each_entry(vma, &vm->active_list, mm_list)

			if (WARN_ON(list_empty(&vma->vma_link) ||

				    list_is_singular(&vma->vma_link)))

				break;



		i915_gem_evict_vm(&ppgtt->base, true);

	} else {

		i915_gem_retire_requests(dev);

		i915_gem_evict_vm(&ppgtt->base, false);

	}



	ppgtt->base.cleanup(&ppgtt->base);

}



/* i915_gem_stolen.c */

int i915_gem_init_stolen(struct drm_device *dev);

int i915_gem_stolen_setup_compression(struct drm_device *dev, int size);

drivers/gpu/drm/i915/i915_gem_context.c

+36 −0
Original line number Diff line number Diff line
@@ -99,6 +99,42 @@ 
static int do_switch(struct intel_ring_buffer *ring,

		     struct i915_hw_context *to);



static void ppgtt_release(struct kref *kref)

{

	struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);

	struct drm_device *dev = ppgtt->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct i915_address_space *vm = &ppgtt->base;



	if (ppgtt == dev_priv->mm.aliasing_ppgtt ||

	    (list_empty(&vm->active_list) && list_empty(&vm->inactive_list))) {

		ppgtt->base.cleanup(&ppgtt->base);

		return;

	}



	/*

	 * Make sure vmas are unbound before we take down the drm_mm

	 *

	 * FIXME: Proper refcounting should take care of this, this shouldn't be

	 * needed at all.

	 */

	if (!list_empty(&vm->active_list)) {

		struct i915_vma *vma;



		list_for_each_entry(vma, &vm->active_list, mm_list)

			if (WARN_ON(list_empty(&vma->vma_link) ||

				    list_is_singular(&vma->vma_link)))

				break;



		i915_gem_evict_vm(&ppgtt->base, true);

	} else {

		i915_gem_retire_requests(dev);

		i915_gem_evict_vm(&ppgtt->base, false);

	}



	ppgtt->base.cleanup(&ppgtt->base);

}



static size_t get_context_alignment(struct drm_device *dev)

{

	if (IS_GEN6(dev))