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

Commit 4c2e0990 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Fixup global gtt cleanup 



The global gtt is setup up in 2 parts, so we need to be careful
with the cleanup. For consistency shovel it all into the ->cleanup
callback, like with ppgtt.

Noticed because it blew up in the out_gtt: cleanup code while
fiddling with the vgacon code.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f418f2ec

drivers/gpu/drm/i915/i915_dma.c

+0 −4
Original line number Diff line number Diff line
@@ -1386,7 +1386,6 @@ cleanup_gem: 
	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	WARN_ON(dev_priv->mm.aliasing_ppgtt);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

cleanup_irq:

	drm_irq_uninstall(dev);

cleanup_gem_stolen:
@@ -1756,8 +1755,6 @@ out_mtrrfree: 
	arch_phys_wc_del(dev_priv->gtt.mtrr);

	io_mapping_free(dev_priv->gtt.mappable);

out_gtt:

	list_del(&dev_priv->gtt.base.global_link);

	drm_mm_takedown(&dev_priv->gtt.base.mm);

	dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);

out_regs:

	intel_uncore_fini(dev);
@@ -1846,7 +1843,6 @@ int i915_driver_unload(struct drm_device *dev) 
			i915_free_hws(dev);

	}



	list_del(&dev_priv->gtt.base.global_link);

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



	drm_vblank_cleanup(dev);

drivers/gpu/drm/i915/i915_gem_gtt.c

+8 −1
Original line number Diff line number Diff line
@@ -1985,7 +1985,10 @@ static void gen6_gmch_remove(struct i915_address_space *vm) 


	struct i915_gtt *gtt = container_of(vm, struct i915_gtt, base);



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

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	iounmap(gtt->gsm);

	teardown_scratch_page(vm->dev);

}
@@ -2018,6 +2021,10 @@ static int i915_gmch_probe(struct drm_device *dev, 


static void i915_gmch_remove(struct i915_address_space *vm)

{

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

		drm_mm_takedown(&vm->mm);

		list_del(&vm->global_link);

	}

	intel_gmch_remove();

}