drm/amdgpu/pm: add missing revision check for CI

commit 2a561b361b7681509710f3cfc3d95d54c87ac69f upstream.

The ci_populate_all_memory_levels() workaround only
applies to revision 0 SKUs.

Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/1816
Fixes: 9f4b35411cfe ("drm/amd/powerplay: add CI asics support to smumgr (v3)")
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 1db15ba8f72f400bbad8ae0ce24fafc43429d4bd)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
index 62ebec1c6fe3c31c688724edf4650cb61cce6942..05ce0616a17f637778266bbcb7ca7844eeecc992 100644 (file)
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
@@ -1326,8 +1326,9 @@ static int ci_populate_all_memory_levels(struct pp_hwmgr *hwmgr)
 
        dev_id = adev->pdev->device;
 
-       if ((dpm_table->mclk_table.count >= 2)
-               && ((dev_id == 0x67B0) ||  (dev_id == 0x67B1))) {
+       if ((dpm_table->mclk_table.count >= 2) &&
+           ((dev_id == 0x67B0) ||  (dev_id == 0x67B1)) &&
+           (adev->pdev->revision == 0)) {
                smu_data->smc_state_table.MemoryLevel[1].MinVddci =
                                smu_data->smc_state_table.MemoryLevel[0].MinVddci;
                smu_data->smc_state_table.MemoryLevel[1].MinMvdd =