diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-11-08 05:59:31 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-08 10:57:06 -0500 |
commit | 02d281d0776e2b8305b18823343a2ee972b72657 (patch) | |
tree | a081a24d7e3c3408f7128a54b4ead7289f5bed8a /drivers/gpu/nvgpu/vgpu | |
parent | 86a307871b95a175eb8ecb3033472a112a0720d1 (diff) |
gpu: nvgpu: remove use of linux specific powergate_mode flag
In dbg_set_powergate(), we use flags NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE/ENABLE
which are defined in linux specific uapi header
Hence we need to remove those flags from common code
Update dbg_set_powergate() to receive boolean flag to disable/enable powergate
instead of NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE/ENABLE
Also update corresponding HALs as per above change
Jira NVGPU-259
Change-Id: I9c4eb30e29ea5ce0d8e25517a6a072fb9f0e92e5
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1594326
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/dbg_vgpu.h | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c index 6e8ab561..0ed66eb9 100644 --- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | |||
@@ -77,28 +77,26 @@ fail: | |||
77 | return err; | 77 | return err; |
78 | } | 78 | } |
79 | 79 | ||
80 | int vgpu_dbg_set_powergate(struct dbg_session_gk20a *dbg_s, __u32 mode) | 80 | int vgpu_dbg_set_powergate(struct dbg_session_gk20a *dbg_s, bool disable_powergate) |
81 | { | 81 | { |
82 | struct tegra_vgpu_cmd_msg msg; | 82 | struct tegra_vgpu_cmd_msg msg; |
83 | struct tegra_vgpu_set_powergate_params *p = &msg.params.set_powergate; | 83 | struct tegra_vgpu_set_powergate_params *p = &msg.params.set_powergate; |
84 | int err = 0; | 84 | int err = 0; |
85 | u32 mode; | ||
85 | 86 | ||
86 | gk20a_dbg_fn(""); | 87 | gk20a_dbg_fn(""); |
87 | 88 | ||
88 | /* Just return if requested mode is the same as the session's mode */ | 89 | /* Just return if requested mode is the same as the session's mode */ |
89 | switch (mode) { | 90 | if (disable_powergate) { |
90 | case NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE: | ||
91 | if (dbg_s->is_pg_disabled) | 91 | if (dbg_s->is_pg_disabled) |
92 | return 0; | 92 | return 0; |
93 | dbg_s->is_pg_disabled = true; | 93 | dbg_s->is_pg_disabled = true; |
94 | break; | 94 | mode = NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE; |
95 | case NVGPU_DBG_GPU_POWERGATE_MODE_ENABLE: | 95 | } else { |
96 | if (!dbg_s->is_pg_disabled) | 96 | if (!dbg_s->is_pg_disabled) |
97 | return 0; | 97 | return 0; |
98 | dbg_s->is_pg_disabled = false; | 98 | dbg_s->is_pg_disabled = false; |
99 | break; | 99 | mode = NVGPU_DBG_GPU_POWERGATE_MODE_ENABLE; |
100 | default: | ||
101 | return -EINVAL; | ||
102 | } | 100 | } |
103 | 101 | ||
104 | msg.cmd = TEGRA_VGPU_CMD_SET_POWERGATE; | 102 | msg.cmd = TEGRA_VGPU_CMD_SET_POWERGATE; |
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.h b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.h index fcdea931..b2ca2a7b 100644 --- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.h +++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.h | |||
@@ -31,7 +31,7 @@ struct gk20a; | |||
31 | int vgpu_exec_regops(struct dbg_session_gk20a *dbg_s, | 31 | int vgpu_exec_regops(struct dbg_session_gk20a *dbg_s, |
32 | struct nvgpu_dbg_gpu_reg_op *ops, | 32 | struct nvgpu_dbg_gpu_reg_op *ops, |
33 | u64 num_ops); | 33 | u64 num_ops); |
34 | int vgpu_dbg_set_powergate(struct dbg_session_gk20a *dbg_s, __u32 mode); | 34 | int vgpu_dbg_set_powergate(struct dbg_session_gk20a *dbg_s, bool disable_powergate); |
35 | bool vgpu_check_and_set_global_reservation( | 35 | bool vgpu_check_and_set_global_reservation( |
36 | struct dbg_session_gk20a *dbg_s, | 36 | struct dbg_session_gk20a *dbg_s, |
37 | struct dbg_profiler_object_data *prof_obj); | 37 | struct dbg_profiler_object_data *prof_obj); |