diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index a2846d2a..de1c82dc 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -1051,10 +1051,10 @@ int gk20a_init_fifo_support(struct gk20a *g) | |||
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | /* return with a reference to the channel, caller must put it back */ | 1053 | /* return with a reference to the channel, caller must put it back */ |
1054 | static struct channel_gk20a * | 1054 | struct channel_gk20a * |
1055 | channel_from_inst_ptr(struct fifo_gk20a *f, u64 inst_ptr) | 1055 | gk20a_refch_from_inst_ptr(struct gk20a *g, u64 inst_ptr) |
1056 | { | 1056 | { |
1057 | struct gk20a *g = f->g; | 1057 | struct fifo_gk20a *f = &g->fifo; |
1058 | unsigned int ci; | 1058 | unsigned int ci; |
1059 | if (unlikely(!f->channel)) | 1059 | if (unlikely(!f->channel)) |
1060 | return NULL; | 1060 | return NULL; |
@@ -1531,7 +1531,7 @@ static bool gk20a_fifo_handle_mmu_fault( | |||
1531 | } | 1531 | } |
1532 | } else { | 1532 | } else { |
1533 | /* read channel based on instruction pointer */ | 1533 | /* read channel based on instruction pointer */ |
1534 | ch = channel_from_inst_ptr(&g->fifo, f.inst_ptr); | 1534 | ch = gk20a_refch_from_inst_ptr(g, f.inst_ptr); |
1535 | referenced_channel = ch; | 1535 | referenced_channel = ch; |
1536 | } | 1536 | } |
1537 | 1537 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index c67ab456..30d0caba 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -331,4 +331,6 @@ void gk20a_dump_eng_status(struct gk20a *g, | |||
331 | const char *gk20a_decode_ccsr_chan_status(u32 index); | 331 | const char *gk20a_decode_ccsr_chan_status(u32 index); |
332 | const char *gk20a_decode_pbdma_chan_eng_ctx_status(u32 index); | 332 | const char *gk20a_decode_pbdma_chan_eng_ctx_status(u32 index); |
333 | 333 | ||
334 | struct channel_gk20a *gk20a_refch_from_inst_ptr(struct gk20a *g, u64 inst_ptr); | ||
335 | |||
334 | #endif /*__GR_GK20A_H__*/ | 336 | #endif /*__GR_GK20A_H__*/ |