2 files changed, 7 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 1d594d29..ab3d86be 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -468,16 +468,6 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
         if (g->ops.clk.get_maxrate)
                 gpu->max_freq = g->ops.clk.get_maxrate(&g->clk);
 
-        g->ops.gr.get_preemption_mode_flags(g, &g->gr.preemption_mode_rec);
-        gpu->graphics_preemption_mode_flags =
-                g->gr.preemption_mode_rec.graphics_preemption_mode_flags;
-        gpu->compute_preemption_mode_flags =
-                g->gr.preemption_mode_rec.compute_preemption_mode_flags;
-        gpu->default_graphics_preempt_mode =
-                g->gr.preemption_mode_rec.default_graphics_preempt_mode;
-        gpu->default_compute_preempt_mode =
-                g->gr.preemption_mode_rec.default_compute_preempt_mode;
-
         gpu->local_video_memory_size = g->mm.vidmem.size;
 
         gpu->pci_vendor_id = g->pci_vendor_id;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index b437838f..3377df5d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -61,6 +61,13 @@
         (PAGE_SIZE/(PATCH_CTX_SLOTS_REQUIRED_PER_ENTRY * sizeof(u32)))
 #define PATCH_CTX_ENTRIES_FROM_SIZE(size) (size/sizeof(u32))
 
+#define NVGPU_PREEMPTION_MODE_GRAPHICS_WFI      (1 << 0)
+#define NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP     (1 << 1)
+
+#define NVGPU_PREEMPTION_MODE_COMPUTE_WFI       (1 << 0)
+#define NVGPU_PREEMPTION_MODE_COMPUTE_CTA       (1 << 1)
+#define NVGPU_PREEMPTION_MODE_COMPUTE_CILP      (1 << 2)
+
 struct channel_gk20a;
 struct nvgpu_warpstate;
 
@@ -403,7 +410,6 @@ struct gr_gk20a {
         bool sw_ready;
         bool skip_ucode_init;
 
-        struct nvgpu_preemption_modes_rec preemption_mode_rec;
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
         struct gr_t18x t18x;
 #endif