diff options
| author | David Nieto <dmartineznie@nvidia.com> | 2016-11-13 23:45:07 -0500 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-06 12:14:05 -0500 |
| commit | 1526670f4af2fb3bdac31009c7a3ebc9df711a49 (patch) | |
| tree | b7a59234aef2d96257b28e5ae7c9827e51510d7f /drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |
| parent | 25969934122dab95b35fc84d194e423801d51861 (diff) | |
gpu: nvgpu: Add support for alarms in arbiter
Pass flags as mask in event initialization
JIRA: DNVGPU-189$
Change-Id: Ied22a585a8f59f44e577bc678f8cef380432c9a2
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1252474
(cherry picked from commit 56fa34b8ac0ebafaf09a8760bec6200adf9f3c39)
Reviewed-on: http://git-master/r/1280886
GVS: Gerrit_Virtual_Submit
Tested-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index 77479d99..9ee06bf3 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
| @@ -1179,10 +1179,11 @@ static int nvgpu_gpu_get_event_fd(struct gk20a *g, | |||
| 1179 | 1179 | ||
| 1180 | gk20a_dbg_fn(""); | 1180 | gk20a_dbg_fn(""); |
| 1181 | 1181 | ||
| 1182 | if (!session || args->flags) | 1182 | if (!session) |
| 1183 | return -EINVAL; | 1183 | return -EINVAL; |
| 1184 | 1184 | ||
| 1185 | return nvgpu_clk_arb_install_event_fd(g, session, &args->event_fd); | 1185 | return nvgpu_clk_arb_install_event_fd(g, session, &args->event_fd, |
| 1186 | args->flags); | ||
| 1186 | } | 1187 | } |
| 1187 | 1188 | ||
| 1188 | static int nvgpu_gpu_get_voltage(struct gk20a *g, | 1189 | static int nvgpu_gpu_get_voltage(struct gk20a *g, |