summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h1
-rw-r--r--drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c10
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index f64a2b96..95736d30 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -141,6 +141,7 @@ enum gk20a_cbc_op {
141#define GPU_LIT_GPFIFO_CLASS 34 141#define GPU_LIT_GPFIFO_CLASS 34
142#define GPU_LIT_I2M_CLASS 35 142#define GPU_LIT_I2M_CLASS 35
143#define GPU_LIT_DMA_COPY_CLASS 36 143#define GPU_LIT_DMA_COPY_CLASS 36
144#define GPU_LIT_GPC_PRIV_STRIDE 37
144 145
145#define nvgpu_get_litter_value(g, v) (g)->ops.get_litter_value((g), v) 146#define nvgpu_get_litter_value(g, v) (g)->ops.get_litter_value((g), v)
146 147
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index 1d764ad2..ed5327cb 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -58,7 +58,7 @@ void gk20a_priv_ring_isr(struct gk20a *g)
58 u32 cmd; 58 u32 cmd;
59 s32 retry = 100; 59 s32 retry = 100;
60 u32 gpc; 60 u32 gpc;
61 u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); 61 u32 gpc_priv_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_PRIV_STRIDE);
62 62
63 if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) 63 if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
64 return; 64 return;
@@ -80,10 +80,10 @@ void gk20a_priv_ring_isr(struct gk20a *g)
80 for (gpc = 0; gpc < g->gr.gpc_count; gpc++) { 80 for (gpc = 0; gpc < g->gr.gpc_count; gpc++) {
81 if (status1 & BIT(gpc)) { 81 if (status1 & BIT(gpc)) {
82 gk20a_dbg(gpu_dbg_intr, "GPC%u write error. ADR %08x WRDAT %08x INFO %08x, CODE %08x", gpc, 82 gk20a_dbg(gpu_dbg_intr, "GPC%u write error. ADR %08x WRDAT %08x INFO %08x, CODE %08x", gpc,
83 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_adr_r() + gpc * gpc_stride), 83 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_adr_r() + gpc * gpc_priv_stride),
84 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_wrdat_r() + gpc * gpc_stride), 84 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_wrdat_r() + gpc * gpc_priv_stride),
85 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_info_r() + gpc * gpc_stride), 85 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_info_r() + gpc * gpc_priv_stride),
86 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_code_r() + gpc * gpc_stride)); 86 gk20a_readl(g, pri_ringstation_gpc_gpc0_priv_error_code_r() + gpc * gpc_priv_stride));
87 } 87 }
88 } 88 }
89 /* clear interrupt */ 89 /* clear interrupt */