This is a note to let you know that I've just added the patch titled
drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-vangogh-don-t-check-for-dpm-in-is_dpm_running-when-in-suspend.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6951c3e4a260f65a16433833d2511e8796dc8625 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Fri, 26 Mar 2021 16:56:07 -0400
Subject: drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in suspend
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 6951c3e4a260f65a16433833d2511e8796dc8625 upstream.
Do the same thing we do for Renoir. We can check, but since
the sbios has started DPM, it will always return true which
causes the driver to skip some of the SMU init when it shouldn't.
Reviewed-by: Zhan Liu <zhan.liu@xxxxxxx>
Acked-by: Evan Quan <evan.quan@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -388,10 +388,15 @@ static int vangogh_get_allowed_feature_m
static bool vangogh_is_dpm_running(struct smu_context *smu)
{
+ struct amdgpu_device *adev = smu->adev;
int ret = 0;
uint32_t feature_mask[2];
uint64_t feature_enabled;
+ /* we need to re-init after suspend so return false */
+ if (adev->in_suspend)
+ return false;
+
ret = smu_cmn_get_enabled_32_bits_mask(smu, feature_mask, 2);
if (ret)
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-5.11/drm-amdgpu-check-alignment-on-cpu-page-for-bo-map.patch
queue-5.11/drm-amdgpu-vangogh-don-t-check-for-dpm-in-is_dpm_running-when-in-suspend.patch
queue-5.11/drm-amdkfd-dqm-fence-memory-corruption.patch
queue-5.11/drm-amdgpu-set-a-suitable-dev_info.gart_page_size.patch
queue-5.11/drm-amdgpu-fix-offset-calculation-in-amdgpu_vm_bo_clear_mappings.patch
queue-5.11/drm-amd-pm-no-need-to-force-mclk-to-highest-when-no-display-connected.patch
