[AMD Official Use Only - General] Reviewed-by: Yifan Zhang <yifan1.zh...@amd.com>
-----Original Message----- From: Huang, Tim <tim.hu...@amd.com> Sent: Saturday, January 28, 2023 11:36 AM To: amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander <alexander.deuc...@amd.com>; Zhang, Yifan <yifan1.zh...@amd.com>; Du, Xiaojian <xiaojian...@amd.com>; Ma, Li <li...@amd.com>; Limonciello, Mario <mario.limoncie...@amd.com>; Huang, Tim <tim.hu...@amd.com> Subject: [PATCH RESEND] drm/amd/pm: drop unneeded dpm features disablement for SMU 13.0.4/11 PMFW will handle the features disablement properly for gpu reset case, driver involvement may cause some unexpected issues. Signed-off-by: Tim Huang <tim.hu...@amd.com> --- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c index ec52830dde24..8bae3fe869cd 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1497,6 +1497,20 @@ static int smu_disable_dpms(struct smu_context *smu) } } + /* + * For SMU 13.0.4/11, PMFW will handle the features disablement properly + * for gpu reset case. Driver involvement is unnecessary. + */ + if (amdgpu_in_reset(adev)) { + switch (adev->ip_versions[MP1_HWIP][0]) { + case IP_VERSION(13, 0, 4): + case IP_VERSION(13, 0, 11): + return 0; + default: + break; + } + } + /* * For gpu reset, runpm and hibernation through BACO, * BACO feature has to be kept enabled. -- 2.25.1