Commit 051172e8 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: Fix ordering of cleanup code 



Commit Fixes: b9f8b09c ("drm/tegra: Setup shared IOMMU domain after
initialization") changed the initialization order of the IOMMU related
bits but didn't update the cleanup path accordingly. This asymmetry can
cause failures during error recovery.

Fixes: b9f8b09c ("drm/tegra: Setup shared IOMMU domain after initialization")
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
parent f1f20eb9

drivers/gpu/drm/tegra/drm.c

+7 −7
Original line number Diff line number Diff line
@@ -201,19 +201,19 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) 
	if (tegra->hub)

		tegra_display_hub_cleanup(tegra->hub);

device:

	host1x_device_exit(device);

fbdev:

	drm_kms_helper_poll_fini(drm);

	tegra_drm_fb_free(drm);

config:

	drm_mode_config_cleanup(drm);



	if (tegra->domain) {

		mutex_destroy(&tegra->mm_lock);

		drm_mm_takedown(&tegra->mm);

		put_iova_domain(&tegra->carveout.domain);

		iova_cache_put();

	}



	host1x_device_exit(device);

fbdev:

	drm_kms_helper_poll_fini(drm);

	tegra_drm_fb_free(drm);

config:

	drm_mode_config_cleanup(drm);

domain:

	if (tegra->domain)

		iommu_domain_free(tegra->domain);