summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gp10b/Makefile1
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/Makefile b/drivers/gpu/nvgpu/gp10b/Makefile
index 3575d414..e897ab9c 100644
--- a/drivers/gpu/nvgpu/gp10b/Makefile
+++ b/drivers/gpu/nvgpu/gp10b/Makefile
@@ -7,6 +7,7 @@ ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
7ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi 7ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi
8 8
9ccflags-$(CONFIG_GK20A) += -Wno-multichar 9ccflags-$(CONFIG_GK20A) += -Wno-multichar
10ccflags-y += -Werror
10 11
11obj-$(CONFIG_GK20A) += \ 12obj-$(CONFIG_GK20A) += \
12 gr_gp10b.o \ 13 gr_gp10b.o \
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index e3d4b973..271a6d0c 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -571,11 +571,12 @@ int gr_gp10b_alloc_gr_ctx(struct gk20a *g,
571 (*gr_ctx)->preempt_mode = flags; 571 (*gr_ctx)->preempt_mode = flags;
572 } 572 }
573 573
574 if (class == PASCAL_COMPUTE_A) 574 if (class == PASCAL_COMPUTE_A) {
575 if (flags == NVGPU_GR_PREEMPTION_MODE_CILP) 575 if (flags == NVGPU_GR_PREEMPTION_MODE_CILP)
576 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CILP; 576 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CILP;
577 else 577 else
578 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CTA; 578 (*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CTA;
579 }
579 580
580 gk20a_dbg_fn("done"); 581 gk20a_dbg_fn("done");
581 582