From fa34536058d0300128446801e5329a04ab910262 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 10 Feb 2023 14:43:15 +0000 Subject: [PATCH] drm/amd/pm: drop unneeded dpm features disablement for SMU 13.0.4/11 From Tim Huang 91ef43f6b65b5aea03e71d70bb510efc61637ff6 in linux-6.1.y/6.1.11 1538709c9f1c207d30afd95ea41b3aeb973f67e7 in mainline linux --- sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c index aacc250708b..1e071db5f34 100644 --- a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1498,6 +1498,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.20.1