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/gp10b/gr_gp10b.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/gp10b/gr_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 78be072f..f1180750 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -1779,10 +1779,10 @@ int gr_gp10b_set_cilp_preempt_pending(struct gk20a *g, | |||
1779 | struct tsg_gk20a *tsg = &g->fifo.tsg[fault_ch->tsgid]; | 1779 | struct tsg_gk20a *tsg = &g->fifo.tsg[fault_ch->tsgid]; |
1780 | 1780 | ||
1781 | gk20a_tsg_event_id_post_event(tsg, | 1781 | gk20a_tsg_event_id_post_event(tsg, |
1782 | NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_STARTED); | 1782 | NVGPU_EVENT_ID_CILP_PREEMPTION_STARTED); |
1783 | } else { | 1783 | } else { |
1784 | gk20a_channel_event_id_post_event(fault_ch, | 1784 | gk20a_channel_event_id_post_event(fault_ch, |
1785 | NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_STARTED); | 1785 | NVGPU_EVENT_ID_CILP_PREEMPTION_STARTED); |
1786 | } | 1786 | } |
1787 | 1787 | ||
1788 | return 0; | 1788 | return 0; |
@@ -1990,10 +1990,10 @@ int gr_gp10b_handle_fecs_error(struct gk20a *g, | |||
1990 | struct tsg_gk20a *tsg = &g->fifo.tsg[ch->tsgid]; | 1990 | struct tsg_gk20a *tsg = &g->fifo.tsg[ch->tsgid]; |
1991 | 1991 | ||
1992 | gk20a_tsg_event_id_post_event(tsg, | 1992 | gk20a_tsg_event_id_post_event(tsg, |
1993 | NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_COMPLETE); | 1993 | NVGPU_EVENT_ID_CILP_PREEMPTION_COMPLETE); |
1994 | } else { | 1994 | } else { |
1995 | gk20a_channel_event_id_post_event(ch, | 1995 | gk20a_channel_event_id_post_event(ch, |
1996 | NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_COMPLETE); | 1996 | NVGPU_EVENT_ID_CILP_PREEMPTION_COMPLETE); |
1997 | } | 1997 | } |
1998 | 1998 | ||
1999 | gk20a_channel_put(ch); | 1999 | gk20a_channel_put(ch); |