lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0658/1039] drm/amd/amdgpu: fix psp tmr bo pin count leak in SRIOV
    Date
    From: Jingwen Chen <Jingwen.Chen2@amd.com>

    [ Upstream commit 85dfc1d692c9434c37842e610be37cd4ae4e0081 ]

    [Why]
    psp tmr bo will be pinned during loading amdgpu and reset in SRIOV while
    only unpinned in unload amdgpu

    [How]
    add amdgpu_in_reset and sriov judgement to skip pin bo

    v2: fix wrong judgement

    Signed-off-by: Jingwen Chen <Jingwen.Chen2@amd.com>
    Reviewed-by: Horace Chen <horace.chen@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_psp.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
    index c641f84649d6b..d011ae7e50a54 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
    @@ -2017,12 +2017,16 @@ static int psp_hw_start(struct psp_context *psp)
    return ret;
    }

    + if (amdgpu_sriov_vf(adev) && amdgpu_in_reset(adev))
    + goto skip_pin_bo;
    +
    ret = psp_tmr_init(psp);
    if (ret) {
    DRM_ERROR("PSP tmr init failed!\n");
    return ret;
    }

    +skip_pin_bo:
    /*
    * For ASICs with DF Cstate management centralized
    * to PMFW, TMR setup should be performed after PMFW
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:12    [W:2.561 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site