From 1526670f4af2fb3bdac31009c7a3ebc9df711a49 Mon Sep 17 00:00:00 2001 From: David Nieto Date: Sun, 13 Nov 2016 20:45:07 -0800 Subject: 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 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 Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') 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, gk20a_dbg_fn(""); - if (!session || args->flags) + if (!session) return -EINVAL; - return nvgpu_clk_arb_install_event_fd(g, session, &args->event_fd); + return nvgpu_clk_arb_install_event_fd(g, session, &args->event_fd, + args->flags); } static int nvgpu_gpu_get_voltage(struct gk20a *g, -- cgit v1.2.2