lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 110/114] Revert "drm/amd/pm: keep the BACO feature enabled for suspend"
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    commit a56f445f807b0276fc0660c330bf93a9ea78e8ea upstream.

    This reverts commit eaa090538e8d21801c6d5f94590c3799e6a528b5.

    Commit ebc002e3ee78 ("drm/amdgpu: don't use BACO for reset in S3")
    stops using BACO for reset during suspend, so it's no longer
    necessary to leave BACO enabled during suspend. This fixes
    resume from suspend on the navy flounder dGPU in the ASUS ROG
    Strix G513QY.

    Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
    Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982
    Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
    Reviewed-by: Mario Limonciello <mario.limonciello@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/pm/swsmu/amdgpu_smu.c | 8 +-------
    1 file changed, 1 insertion(+), 7 deletions(-)

    --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
    +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
    @@ -1405,14 +1405,8 @@ 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) || (adev->in_suspend && !adev->in_s0ix)) &&
    + ((amdgpu_in_reset(adev) &&
    (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
    ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));


    \
     
     \ /
      Last update: 2022-05-16 22:41    [W:5.629 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site