summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.c4
-rw-r--r--include/uapi/linux/nvgpu-t18x.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 03462d5f..33a52db5 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -475,7 +475,7 @@ static int gr_gp10b_alloc_gr_ctx(struct gk20a *g,
475 if (err) 475 if (err)
476 return err; 476 return err;
477 477
478 if (flags == NVGPU_GR_PREEMPTION_MODE_GFXP) { 478 if (flags & NVGPU_ALLOC_OBJ_FLAGS_GFXP) {
479 u32 spill_size = 479 u32 spill_size =
480 gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v(); 480 gr_gpc0_swdx_rm_spill_buffer_size_256b_default_v();
481 u32 pagepool_size = g->ops.gr.pagepool_default_size(g) * 481 u32 pagepool_size = g->ops.gr.pagepool_default_size(g) *
@@ -528,7 +528,7 @@ static int gr_gp10b_alloc_gr_ctx(struct gk20a *g,
528 } 528 }
529 529
530 if (class == PASCAL_COMPUTE_A) { 530 if (class == PASCAL_COMPUTE_A) {
531 if (flags == NVGPU_GR_PREEMPTION_MODE_CILP) 531 if (flags & NVGPU_ALLOC_OBJ_FLAGS_CILP)
532 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CILP; 532 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CILP;
533 else 533 else
534 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CTA; 534 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CTA;
diff --git a/include/uapi/linux/nvgpu-t18x.h b/include/uapi/linux/nvgpu-t18x.h
index 76814415..b2a75143 100644
--- a/include/uapi/linux/nvgpu-t18x.h
+++ b/include/uapi/linux/nvgpu-t18x.h
@@ -39,6 +39,10 @@
39 */ 39 */
40#define NVGPU_ALLOC_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE (1 << 2) 40#define NVGPU_ALLOC_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE (1 << 2)
41 41
42/* Flags in nvgpu_alloc_obj_ctx_args.flags */
43#define NVGPU_ALLOC_OBJ_FLAGS_GFXP (1 << 1)
44#define NVGPU_ALLOC_OBJ_FLAGS_CILP (1 << 2)
45
42#endif /* _UAPI__LINUX_NVGPU_T18X_IOCTL_H_ */ 46#endif /* _UAPI__LINUX_NVGPU_T18X_IOCTL_H_ */
43 47
44 48