diff options
author | Cyril Raju <craju@nvidia.com> | 2017-01-30 20:37:05 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-06 19:41:06 -0500 |
commit | a58dc5728259e083533b0a534620a930bb34a4ba (patch) | |
tree | 0dec8c4c91537d126cdb07ff25da03aa6680997a /drivers/gpu/nvgpu | |
parent | 771445abc8c6e15cd0c8a8943c7cf4bc2081f839 (diff) |
Revert "Revert "nvgpu: gp10b:remove EMC floor when GPU Fmin""
This reverts commit 74948b73e3667 ("Revert "nvgpu:
gp10b: remove EMC floor when GPU Fmin"")
The orginal patch caused instability in GVS and was reverted
for unknown reasons.This reverts the revert.
Revert patch : http://git-master/r/#/c/1291512/
Original patch : http://git-master/r/#/c/1284572/
Bug 1864117
Bug 1863013
Change-Id: Iaeef74296d0df4bb63d02d567e0d4be63688643a
Signed-off-by: Cyril Raju <craju@nvidia.com>
Reviewed-on: http://git-master/r/1296294
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c index fe42bf97..e428f9e6 100644 --- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | |||
@@ -312,7 +312,14 @@ static void gp10b_tegra_postscale(struct device *pdev, | |||
312 | 312 | ||
313 | gk20a_dbg_fn(""); | 313 | gk20a_dbg_fn(""); |
314 | if (profile && !gp10b_tegra_is_railgated(pdev)) { | 314 | if (profile && !gp10b_tegra_is_railgated(pdev)) { |
315 | emc_rate = (freq * EMC_BW_RATIO * g->emc3d_ratio) / 1000; | 315 | unsigned long emc_scale; |
316 | |||
317 | if (freq <= gp10b_freq_table[0]) | ||
318 | emc_scale = 0; | ||
319 | else | ||
320 | emc_scale = g->emc3d_ratio; | ||
321 | |||
322 | emc_rate = (freq * EMC_BW_RATIO * emc_scale) / 1000; | ||
316 | 323 | ||
317 | if (emc_rate > tegra_bwmgr_get_max_emc_rate()) | 324 | if (emc_rate > tegra_bwmgr_get_max_emc_rate()) |
318 | emc_rate = tegra_bwmgr_get_max_emc_rate(); | 325 | emc_rate = tegra_bwmgr_get_max_emc_rate(); |