drm/amdgpu: Correct the place of amdgpu_pm_sysfs_fini
authorEmily Deng <Emily.Deng@amd.com>
Thu, 8 Mar 2018 01:35:19 +0000 (09:35 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 14 Mar 2018 19:38:25 +0000 (14:38 -0500)
The amdgpu_pm_sysfs_fini should call before amdgpu_device_ip_fini,
or the adev->pm.dpm_enabled would be set to 0, then the device files
related to pp won't be removed by amdgpu_pm_sysfs_fini when unload
driver.

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 8563784..9a2c2c3 100644 (file)
@@ -2086,6 +2086,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
 
        amdgpu_ib_pool_fini(adev);
        amdgpu_fence_driver_fini(adev);
+       amdgpu_pm_sysfs_fini(adev);
        amdgpu_fbdev_fini(adev);
        r = amdgpu_device_ip_fini(adev);
        if (adev->firmware.gpu_info_fw) {
@@ -2114,7 +2115,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
        iounmap(adev->rmmio);
        adev->rmmio = NULL;
        amdgpu_device_doorbell_fini(adev);
-       amdgpu_pm_sysfs_fini(adev);
        amdgpu_debugfs_regs_cleanup(adev);
 }