diff options
author | Sunny He <suhe@nvidia.com> | 2017-06-27 19:08:48 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-07-26 05:44:14 -0400 |
commit | 92f6eb016cc759b24e249ed6c17cff537cc35db7 (patch) | |
tree | 4c3041422fa3c114f9aad3ab5e30ad6673389578 /drivers/gpu/nvgpu/gk20a | |
parent | b260df606b759e9d9e82a54e6eda05be18df5bf5 (diff) |
gpu: nvgpu: Remove pmupstate flag from gpu_ops
Replace pmupstate boolean flag in gpu_ops with entry in
common flag system.
The new common flag is NVGPU_PMU_PSTATE
Jira NVGPU-74
Change-Id: I4e1ba922a48145b1cf3488b6f14fde78107adb5b
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1514059
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 32441c5b..21e861fe 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -138,7 +138,7 @@ int gk20a_prepare_poweroff(struct gk20a *g) | |||
138 | ret |= g->ops.clk.suspend_clk_support(g); | 138 | ret |= g->ops.clk.suspend_clk_support(g); |
139 | 139 | ||
140 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 140 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
141 | if (g->ops.pmupstate) | 141 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) |
142 | gk20a_deinit_pstate_support(g); | 142 | gk20a_deinit_pstate_support(g); |
143 | #endif | 143 | #endif |
144 | g->power_on = false; | 144 | g->power_on = false; |
@@ -252,7 +252,7 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
252 | } | 252 | } |
253 | 253 | ||
254 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 254 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
255 | if (g->ops.pmupstate) { | 255 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { |
256 | err = gk20a_init_pstate_support(g); | 256 | err = gk20a_init_pstate_support(g); |
257 | if (err) { | 257 | if (err) { |
258 | nvgpu_err(g, "failed to init pstates"); | 258 | nvgpu_err(g, "failed to init pstates"); |
@@ -276,7 +276,7 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
276 | } | 276 | } |
277 | 277 | ||
278 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 278 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
279 | if (g->ops.pmupstate) { | 279 | if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) { |
280 | err = gk20a_init_pstate_pmu_support(g); | 280 | err = gk20a_init_pstate_pmu_support(g); |
281 | if (err) { | 281 | if (err) { |
282 | nvgpu_err(g, "failed to init pstates"); | 282 | nvgpu_err(g, "failed to init pstates"); |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index ff8eb988..17a06099 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -994,7 +994,6 @@ struct gpu_ops { | |||
994 | } priv_ring; | 994 | } priv_ring; |
995 | bool privsecurity; | 995 | bool privsecurity; |
996 | bool securegpccs; | 996 | bool securegpccs; |
997 | bool pmupstate; | ||
998 | }; | 997 | }; |
999 | 998 | ||
1000 | struct nvgpu_bios_ucode { | 999 | struct nvgpu_bios_ucode { |