Commit 62d5f9f7 authored by Leslie Shi's avatar Leslie Shi Committed by Alex Deucher
Browse files

drm/amdgpu: Unmap MMIO mappings when device is not unplugged 



Patch: 3efb17ae7e92 ("drm/amdgpu: Call amdgpu_device_unmap_mmio() if device
is unplugged to prevent crash in GPU initialization failure") makes call to
amdgpu_device_unmap_mmio() conditioned on device unplugged. This patch unmaps
MMIO mappings even when device is not unplugged.

v2: Add condition of drm_dev_enter() to deleted unmaps in patch
"drm/amdgpu: Unmap all MMIO mappings"

Signed-off-by: default avatarLeslie Shi <Yuliang.Shi@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6638391b

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

+11 −0
Original line number Diff line number Diff line
@@ -3833,6 +3833,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 


static void amdgpu_device_unmap_mmio(struct amdgpu_device *adev)

{



	/* Clear all CPU mappings pointing to this device */

	unmap_mapping_range(adev->ddev.anon_inode->i_mapping, 0, 0, 1);
@@ -3913,6 +3914,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 


void amdgpu_device_fini_sw(struct amdgpu_device *adev)

{

	int idx;



	amdgpu_fence_driver_sw_fini(adev);

	amdgpu_device_ip_fini(adev);

	release_firmware(adev->firmware.gpu_info_fw);
@@ -3937,6 +3940,14 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev) 
	if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)

		vga_client_unregister(adev->pdev);



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



		iounmap(adev->rmmio);

		adev->rmmio = NULL;

		amdgpu_device_doorbell_fini(adev);

		drm_dev_exit(idx);

	}



	if (IS_ENABLED(CONFIG_PERF_EVENTS))

		amdgpu_pmu_fini(adev);

	if (adev->mman.discovery_bin)

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

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/slab.h>

#include <linux/dma-buf.h>



#include <drm/drm_drv.h>

#include <drm/amdgpu_drm.h>

#include <drm/drm_cache.h>

#include "amdgpu.h"
@@ -1061,7 +1062,18 @@ int amdgpu_bo_init(struct amdgpu_device *adev) 
 */

void amdgpu_bo_fini(struct amdgpu_device *adev)

{

	int idx;



	amdgpu_ttm_fini(adev);



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



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

			arch_phys_wc_del(adev->gmc.vram_mtrr);

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

		}

		drm_dev_exit(idx);

	}

}



/**

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

+11 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/sizes.h>

#include <linux/module.h>



#include <drm/drm_drv.h>

#include <drm/ttm/ttm_bo_api.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_placement.h>
@@ -1804,6 +1805,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
 */

void amdgpu_ttm_fini(struct amdgpu_device *adev)

{

	int idx;

	if (!adev->mman.initialized)

		return;
@@ -1818,6 +1820,15 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
				      NULL, NULL);

	amdgpu_ttm_fw_reserve_vram_fini(adev);



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



		if (adev->mman.aper_base_kaddr)

			iounmap(adev->mman.aper_base_kaddr);

		adev->mman.aper_base_kaddr = NULL;



		drm_dev_exit(idx);

	}



	amdgpu_vram_mgr_fini(adev);

	amdgpu_gtt_mgr_fini(adev);

	amdgpu_preempt_mgr_fini(adev);