lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 351/917] drm/amdgpu: move amdgpu_virt_release_full_gpu to fini_early stage
    Date
    From: Guchun Chen <guchun.chen@amd.com>

    [ Upstream commit 6effad8abe0ba4db3d9c58ed585127858a990f35 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    index 5b88c873c8a89..f7a98e9e68d88 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    @@ -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;
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:38    [W:4.080 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site