From: Evan Quan <evan.quan@amd.com>
Date: Thu, 18 Jun 2020 07:53:05 +0000 (+0800)
Subject: drm/amd/pm: correct vddci table setup
X-Git-Tag: v5.15.73~13090^2~12^2~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8849fe64f668a241d9005116078236a40f1c9e08;p=platform%2Fkernel%2Flinux-rpi.git

drm/amd/pm: correct vddci table setup

Make sure the settings are applied only when voltage
controlled by gpio.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
index a950387b492f..34cf3bedfc11 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
@@ -714,9 +714,9 @@ static int polaris10_populate_smc_vddci_table(struct pp_hwmgr *hwmgr,
 
 			table->Smio[level] |= data->vddci_voltage_table.entries[level].smio_low;
 		}
-	}
 
-	table->SmioMask1 = data->vddci_voltage_table.mask_low;
+		table->SmioMask1 = data->vddci_voltage_table.mask_low;
+	}
 
 	return 0;
 }