diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-11-03 08:36:10 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-06 14:20:01 -0500 |
commit | 1480afeb013decec1d5451fd0d3eeaffa8e17bb6 (patch) | |
tree | 41325c4bb8b45ae9f98febc85dd6634c5113d5b9 /drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | |
parent | 69c301a99201d6945fb3bd4df821aedf6d590d46 (diff) |
gpu: nvgpu: define EVENT_IDs in common code
All the event ids NVGPU_IOCTL_CHANNEL_EVENT_ID_* are defined in linux
specific user header uapi/linux/nvgpu.h and can't be used in common
code
Hence add new definitions of type NVGPU_EVENT_ID_* for all the events
in common code and use them wherever required in common code
For future additions to event ids, we need to update both
NVGPU_IOCTL_CHANNEL_EVENT_ID_* and NVGPU_EVENT_ID_* fields
Also add new API nvgpu_event_id_to_ioctl_channel_event_id() to convert
common event_id of the form NVGPU_EVENT_ID_* to Linux specific event_id
of the form NVGPU_IOCTL_CHANNEL_EVENT_ID_*
Use this API in gk20a_channel/tsg_event_id_post_event() to get correct
event_id
Jira NVGPU-259
Change-Id: I15a7f41181fdbb8f1876f88bbcd044447d88325f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1591434
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/common/linux/ioctl_tsg.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c index 2570886d..681a5e66 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | |||
@@ -80,11 +80,16 @@ static int gk20a_tsg_get_event_data_from_id(struct tsg_gk20a *tsg, | |||
80 | } | 80 | } |
81 | 81 | ||
82 | void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg, | 82 | void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg, |
83 | int event_id) | 83 | int __event_id) |
84 | { | 84 | { |
85 | struct gk20a_event_id_data *event_id_data; | 85 | struct gk20a_event_id_data *event_id_data; |
86 | u32 event_id; | ||
86 | int err = 0; | 87 | int err = 0; |
87 | 88 | ||
89 | event_id = nvgpu_event_id_to_ioctl_channel_event_id(__event_id); | ||
90 | if (event_id >= NVGPU_IOCTL_CHANNEL_EVENT_ID_MAX) | ||
91 | return; | ||
92 | |||
88 | err = gk20a_tsg_get_event_data_from_id(tsg, event_id, | 93 | err = gk20a_tsg_get_event_data_from_id(tsg, event_id, |
89 | &event_id_data); | 94 | &event_id_data); |
90 | if (err) | 95 | if (err) |