lkml.org 
[lkml]   [2022]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 72/72] drm/amd/pm: keep the BACO feature enabled for suspend
    Date
    From: Evan Quan <evan.quan@amd.com>

    commit eaa090538e8d21801c6d5f94590c3799e6a528b5 upstream.

    To pair with the workaround which always reset the ASIC in suspend.
    Otherwise, the reset which relies on BACO will fail.

    Fixes: daf8de0874ab5b ("drm/amdgpu: always reset the asic in suspend (v2)")

    Signed-off-by: Evan Quan <evan.quan@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Guchun Chen <guchun.chen@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
    +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
    @@ -1386,8 +1386,14 @@ static int smu_disable_dpms(struct smu_c
    {
    struct amdgpu_device *adev = smu->adev;
    int ret = 0;
    + /*
    + * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
    + * the workaround which always reset the asic in suspend.
    + * It's likely that workaround will be dropped in the future.
    + * Then the change here should be dropped together.
    + */
    bool use_baco = !smu->is_apu &&
    - ((amdgpu_in_reset(adev) &&
    + (((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
    (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
    ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));


    \
     
     \ /
      Last update: 2022-01-10 08:48    [W:4.120 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site