Commit a0ba1279 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Fix unmapping of aperture 



When aperture size is zero, there is no mapping done.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e181be58

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+1 −1
Original line number Diff line number Diff line
@@ -4121,7 +4121,7 @@ static void amdgpu_device_unmap_mmio(struct amdgpu_device *adev) 
	adev->mman.aper_base_kaddr = NULL;



	/* Memory manager related */

	if (!adev->gmc.xgmi.connected_to_cpu) {

	if (!adev->gmc.xgmi.connected_to_cpu && !adev->gmc.is_app_apu) {

		arch_phys_wc_del(adev->gmc.vram_mtrr);

		arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size);

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+1 −2
Original line number Diff line number Diff line
@@ -1080,8 +1080,7 @@ void amdgpu_bo_fini(struct amdgpu_device *adev) 
	amdgpu_ttm_fini(adev);



	if (drm_dev_enter(adev_to_drm(adev), &idx)) {



		if (!adev->gmc.xgmi.connected_to_cpu) {

		if (!adev->gmc.xgmi.connected_to_cpu && !adev->gmc.is_app_apu) {

			arch_phys_wc_del(adev->gmc.vram_mtrr);

			arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size);

		}

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+4 −3
Original line number Diff line number Diff line
@@ -1844,12 +1844,13 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,

				adev->gmc.visible_vram_size);



	else if (!adev->gmc.is_app_apu)

	else if (adev->gmc.is_app_apu)

		DRM_DEBUG_DRIVER(

			"No need to ioremap when real vram size is 0\n");

	else

#endif

		adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,

				adev->gmc.visible_vram_size);

	else

		DRM_DEBUG_DRIVER("No need to ioremap when real vram size is 0\n");

#endif



	/*