Skip to content

Commit

Permalink
drm/amdgpu/vangogh: don't check for dpm in is_dpm_running when in sus…
Browse files Browse the repository at this point in the history
…pend

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@amd.com>
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
  • Loading branch information
alexdeucher committed Apr 1, 2021
1 parent e92049a commit 6951c3e
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,15 @@ static int vangogh_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)

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)
Expand Down

0 comments on commit 6951c3e

Please sign in to comment.