]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu: move amdgpu_virt_release_full_gpu to fini_early stage
authorGuchun Chen <guchun.chen@amd.com>
Sat, 18 Sep 2021 05:43:41 +0000 (13:43 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 23 Sep 2021 20:34:28 +0000 (16:34 -0400)
adev->rmmio is set to be NULL in amdgpu_device_unmap_mmio to prevent
access after pci_remove, however, in SRIOV case, amdgpu_virt_release_full_gpu
will still use adev->rmmio for access after amdgpu_device_unmap_mmio.
The patch is to move such SRIOV calling earlier to fini_early stage.

Fixes: 07775fc13878 ("drm/amdgpu: Unmap all MMIO mappings")
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Leslie Shi <Yuliang.Shi@amd.com>
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 620c7b773b15aa77d4d3a591b97f6d751b010f4b..48089dc0180b532e9a72df992280ea28e508686c 100644 (file)
@@ -2745,6 +2745,11 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev)
                adev->ip_blocks[i].status.hw = false;
        }
 
+       if (amdgpu_sriov_vf(adev)) {
+               if (amdgpu_virt_release_full_gpu(adev, false))
+                       DRM_ERROR("failed to release exclusive mode on fini\n");
+       }
+
        return 0;
 }
 
@@ -2805,10 +2810,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
 
        amdgpu_ras_fini(adev);
 
-       if (amdgpu_sriov_vf(adev))
-               if (amdgpu_virt_release_full_gpu(adev, false))
-                       DRM_ERROR("failed to release exclusive mode on fini\n");
-
        return 0;
 }