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

Commit 70e32544 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Cleanup aliasging ppgtt alongside the global gtt 



Also remove related WARN_ONs which seem to have been hit since a rather
long time. But apperently no one noticed since our module reload is
already WARNING-infested :(

Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 90d0a0e8

drivers/gpu/drm/i915/i915_dma.c

+0 −4
Original line number Diff line number Diff line
@@ -1388,7 +1388,6 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	i915_gem_cleanup_ringbuffer(dev);

	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	WARN_ON(dev_priv->mm.aliasing_ppgtt);

cleanup_irq:

	drm_irq_uninstall(dev);

cleanup_gem_stolen:
@@ -1901,7 +1900,6 @@ int i915_driver_unload(struct drm_device *dev) 
		mutex_lock(&dev->struct_mutex);

		i915_gem_cleanup_ringbuffer(dev);

		i915_gem_context_fini(dev);

		WARN_ON(dev_priv->mm.aliasing_ppgtt);

		mutex_unlock(&dev->struct_mutex);

		i915_gem_cleanup_stolen(dev);
@@ -1909,8 +1907,6 @@ int i915_driver_unload(struct drm_device *dev) 
			i915_free_hws(dev);

	}



	WARN_ON(!list_empty(&dev_priv->vm_list));



	drm_vblank_cleanup(dev);



	intel_teardown_gmbus(dev);

drivers/gpu/drm/i915/i915_gem_gtt.c

+7 −0
Original line number Diff line number Diff line
@@ -1772,6 +1772,12 @@ void i915_global_gtt_cleanup(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

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



	if (dev_priv->mm.aliasing_ppgtt) {

		struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;



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

	}



	if (drm_mm_initialized(&vm->mm)) {

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);
@@ -1779,6 +1785,7 @@ void i915_global_gtt_cleanup(struct drm_device *dev) 


	vm->cleanup(vm);

}



static int setup_scratch_page(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;