summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/nvgpu_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/nvgpu_common.c')
-rw-r--r--drivers/gpu/nvgpu/common/nvgpu_common.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c
index a07a8f7d..f8f4a636 100644
--- a/drivers/gpu/nvgpu/common/nvgpu_common.c
+++ b/drivers/gpu/nvgpu/common/nvgpu_common.c
@@ -19,6 +19,7 @@
19 19
20#include <nvgpu/kmem.h> 20#include <nvgpu/kmem.h>
21#include <nvgpu/nvgpu_common.h> 21#include <nvgpu/nvgpu_common.h>
22#include <nvgpu/soc.h>
22 23
23#include "gk20a/gk20a_scale.h" 24#include "gk20a/gk20a_scale.h"
24#include "gk20a/gk20a.h" 25#include "gk20a/gk20a.h"
@@ -60,7 +61,7 @@ static void nvgpu_init_vars(struct gk20a *g)
60static void nvgpu_init_timeout(struct gk20a *g) 61static void nvgpu_init_timeout(struct gk20a *g)
61{ 62{
62 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; 63 g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT;
63 if (tegra_platform_is_silicon()) 64 if (nvgpu_platform_is_silicon(g))
64 g->timeouts_enabled = true; 65 g->timeouts_enabled = true;
65} 66}
66 67
@@ -85,17 +86,17 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
85 * power features and for silicon platforms, read from platform data 86 * power features and for silicon platforms, read from platform data
86 */ 87 */
87 g->slcg_enabled = 88 g->slcg_enabled =
88 tegra_platform_is_silicon() ? platform->enable_slcg : false; 89 nvgpu_platform_is_silicon(g) ? platform->enable_slcg : false;
89 g->blcg_enabled = 90 g->blcg_enabled =
90 tegra_platform_is_silicon() ? platform->enable_blcg : false; 91 nvgpu_platform_is_silicon(g) ? platform->enable_blcg : false;
91 g->elcg_enabled = 92 g->elcg_enabled =
92 tegra_platform_is_silicon() ? platform->enable_elcg : false; 93 nvgpu_platform_is_silicon(g) ? platform->enable_elcg : false;
93 g->elpg_enabled = 94 g->elpg_enabled =
94 tegra_platform_is_silicon() ? platform->enable_elpg : false; 95 nvgpu_platform_is_silicon(g) ? platform->enable_elpg : false;
95 g->aelpg_enabled = 96 g->aelpg_enabled =
96 tegra_platform_is_silicon() ? platform->enable_aelpg : false; 97 nvgpu_platform_is_silicon(g) ? platform->enable_aelpg : false;
97 g->mscg_enabled = 98 g->mscg_enabled =
98 tegra_platform_is_silicon() ? platform->enable_mscg : false; 99 nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false;
99 100
100 /* set default values to aelpg parameters */ 101 /* set default values to aelpg parameters */
101 g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US; 102 g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US;