gpu: nvgpu: separate IOCTL to set preemption mode

Add separate IOCTL NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE
to allow setting preemption modes from UMD

Define preemption modes in nvgpu.h and use them everywhere
Remove mode definitions from mm_gk20a.h

Also, we support setting only one preemption mode in a channel
But it is possible to have multiple preemption modes (one from
graphics and one from compute) set simultaneously

Hence, update struct gr_ctx_desc to include two separate
preemption modes (graphics_preempt_mode and compute_preempt_mode)

API NVGPU_IOCTL_CHANNEL_SET_PREEMPTION_MODE also supports
setting two separate preemption modes i.e. one for graphics
and one for compute

Make necessary changes in code to support two preemption
modes

Bug 1646259

Change-Id: Ia1dea19e609ba8cc0de2f39ab6c0c4cd6b0a752c
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1131805
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 24123eea..10997c17 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -628,18 +628,23 @@ int gr_gk20a_resume_contexts(struct gk20a *g,
                               struct dbg_session_gk20a *dbg_s,
                               int *ctx_resident_ch_fd);
 
-#define NVGPU_GR_PREEMPTION_MODE_WFI            0
-#define NVGPU_GR_PREEMPTION_MODE_CTA            2
-
-static inline const char *gr_gk20a_preempt_mode_name(u32 preempt_mode)
+static inline const char *gr_gk20a_graphics_preempt_mode_name(u32 graphics_preempt_mode)
 {
-        switch (preempt_mode) {
-        case NVGPU_GR_PREEMPTION_MODE_WFI:
+        switch (graphics_preempt_mode) {
+        case NVGPU_GRAPHICS_PREEMPTION_MODE_WFI:
                 return "WFI";
+        default:
+                return "?";
+        }
+}
 
-        case NVGPU_GR_PREEMPTION_MODE_CTA:
+static inline const char *gr_gk20a_compute_preempt_mode_name(u32 compute_preempt_mode)
+{
+        switch (compute_preempt_mode) {
+        case NVGPU_COMPUTE_PREEMPTION_MODE_WFI:
+                return "WFI";
+        case NVGPU_COMPUTE_PREEMPTION_MODE_CTA:
                 return "CTA";
-
         default:
                 return "?";
         }