lkml.org 
[lkml]   [2021]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 050/130] drm/amdgpu: move iommu_resume before ip init/resume
    Date
    From: James Zhu <James.Zhu@amd.com>

    commit f02abeb0779700c308e661a412451b38962b8a0b upstream.

    Separate iommu_resume from kfd_resume, and move it before
    other amdgpu ip init/resume.

    Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277
    Signed-off-by: James Zhu <James.Zhu@amd.com>
    Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    @@ -2220,6 +2220,10 @@ static int amdgpu_device_ip_init(struct
    if (r)
    goto init_failed;

    + r = amdgpu_amdkfd_resume_iommu(adev);
    + if (r)
    + goto init_failed;
    +
    r = amdgpu_device_ip_hw_init_phase1(adev);
    if (r)
    goto init_failed;
    @@ -2913,6 +2917,10 @@ static int amdgpu_device_ip_resume(struc
    {
    int r;

    + r = amdgpu_amdkfd_resume_iommu(adev);
    + if (r)
    + return r;
    +
    r = amdgpu_device_ip_resume_phase1(adev);
    if (r)
    return r;
    @@ -4296,6 +4304,10 @@ static int amdgpu_do_asic_reset(struct a

    if (!r) {
    dev_info(tmp_adev->dev, "GPU reset succeeded, trying to resume\n");
    + r = amdgpu_amdkfd_resume_iommu(tmp_adev);
    + if (r)
    + goto out;
    +
    r = amdgpu_device_ip_resume_phase1(tmp_adev);
    if (r)
    goto out;

    \
     
     \ /
      Last update: 2021-12-06 16:40    [W:7.835 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site