drm/amd/pm: Correct DPMS disable IP version check
authorMario Limonciello <mario.limonciello@amd.com>
Thu, 4 Nov 2021 15:44:50 +0000 (10:44 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 5 Nov 2021 18:11:43 +0000 (14:11 -0400)
Previously there was a check based on chip # for chips that aligned to
>=CHIP_NAVI10 to have RLC stopped as part of DPMS check.  This was because
of gfxclk being controlled by RLC in the newer designs.

As part of IP version checking though, this got changed to match IP
version for SMU.  Because Renoir designs also include smu11 that meant
that even GFX9 started to stop RLC earlier.

Adjust to match GFX IP version instead of SMU IP version to restore the
previous behavior.

Fixes: a8967967f6a5 ("drm/amdgpu/amdgpu_smu: convert to IP version checking")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

index 821ae6e7870353783a533980546695884c37dd13..01168b8955bff3ce80b1c7a6e6df04b050a9bcab 100644 (file)
@@ -1468,7 +1468,7 @@ static int smu_disable_dpms(struct smu_context *smu)
                        dev_err(adev->dev, "Failed to disable smu features.\n");
        }
 
-       if (adev->ip_versions[MP1_HWIP][0] >= IP_VERSION(11, 0, 0) &&
+       if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(10, 0, 0) &&
            adev->gfx.rlc.funcs->stop)
                adev->gfx.rlc.funcs->stop(adev);