Merge branch 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

airlied · airlied · commit 72777fe79768 · 2018-05-11T10:37:17.000+10:00
Single amdgpu regression fix

* 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/pp: Fix performance drop on Fiji
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c
@@ -852,12 +852,10 @@ int smu7_set_power_limit(struct pp_hwmgr *hwmgr, uint32_t n)
 {
 	struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 
-	n = (n & 0xff) << 8;
-
 	if (data->power_containment_features &
 			POWERCONTAINMENT_FEATURE_PkgPwrLimit)
 		return smum_send_msg_to_smc_with_parameter(hwmgr,
-				PPSMC_MSG_PkgPwrSetLimit, n);
+				PPSMC_MSG_PkgPwrSetLimit, n<<8);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -852,12 +852,10 @@ int smu7_set_power_limit(struct pp_hwmgr *hwmgr, uint32_t n)`
`852`	`852`	`{`
`853`	`853`	`struct smu7_hwmgr data = (struct smu7_hwmgr )(hwmgr->backend);`
`854`	`854`
`855`		`- n = (n & 0xff) << 8;`
`856`		`-`
`857`	`855`	`if (data->power_containment_features &`
`858`	`856`	`POWERCONTAINMENT_FEATURE_PkgPwrLimit)`
`859`	`857`	`return smum_send_msg_to_smc_with_parameter(hwmgr,`
`860`		`- PPSMC_MSG_PkgPwrSetLimit, n);`
	`858`	`+ PPSMC_MSG_PkgPwrSetLimit, n<<8);`
`861`	`859`	`return 0;`
`862`	`860`	`}`
`863`	`861`