summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gv11b/fifo_gv11b.c9
-rw-r--r--drivers/gpu/nvgpu/gv11b/fifo_gv11b.h6
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index ebe5cf4e..51923636 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -58,11 +58,6 @@
58#include "gr_gv11b.h" 58#include "gr_gv11b.h"
59#include "mc_gv11b.h" 59#include "mc_gv11b.h"
60 60
61#define PBDMA_SUBDEVICE_ID 1
62
63static void gv11b_fifo_init_ramfc_eng_method_buffer(struct gk20a *g,
64 struct channel_gk20a *ch, struct nvgpu_mem *mem);
65
66void gv11b_get_tsg_runlist_entry(struct tsg_gk20a *tsg, u32 *runlist) 61void gv11b_get_tsg_runlist_entry(struct tsg_gk20a *tsg, u32 *runlist)
67{ 62{
68 63
@@ -128,7 +123,7 @@ void gv11b_get_ch_runlist_entry(struct channel_gk20a *c, u32 *runlist)
128 runlist[0], runlist[1], runlist[2], runlist[3]); 123 runlist[0], runlist[1], runlist[2], runlist[3]);
129} 124}
130 125
131static void gv11b_userd_writeback_config(struct gk20a *g) 126void gv11b_userd_writeback_config(struct gk20a *g)
132{ 127{
133 gk20a_writel(g, fifo_userd_writeback_r(), fifo_userd_writeback_timer_f( 128 gk20a_writel(g, fifo_userd_writeback_r(), fifo_userd_writeback_timer_f(
134 fifo_userd_writeback_timer_100us_v())); 129 fifo_userd_writeback_timer_100us_v()));
@@ -1567,7 +1562,7 @@ unsigned int gv11b_fifo_handle_pbdma_intr_1(struct gk20a *g,
1567 return rc_type; 1562 return rc_type;
1568} 1563}
1569 1564
1570static void gv11b_fifo_init_ramfc_eng_method_buffer(struct gk20a *g, 1565void gv11b_fifo_init_ramfc_eng_method_buffer(struct gk20a *g,
1571 struct channel_gk20a *ch, struct nvgpu_mem *mem) 1566 struct channel_gk20a *ch, struct nvgpu_mem *mem)
1572{ 1567{
1573 struct tsg_gk20a *tsg; 1568 struct tsg_gk20a *tsg;
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
index 2bd82d5f..380db592 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h
@@ -25,6 +25,8 @@
25#ifndef FIFO_GV11B_H 25#ifndef FIFO_GV11B_H
26#define FIFO_GV11B_H 26#define FIFO_GV11B_H
27 27
28#define PBDMA_SUBDEVICE_ID 1
29
28#define FIFO_INVAL_PBDMA_ID ((u32)~0) 30#define FIFO_INVAL_PBDMA_ID ((u32)~0)
29#define FIFO_INVAL_VEID ((u32)~0) 31#define FIFO_INVAL_VEID ((u32)~0)
30 32
@@ -117,4 +119,8 @@ int gv11b_init_fifo_setup_hw(struct gk20a *g);
117 119
118void gv11b_fifo_tsg_verify_status_faulted(struct channel_gk20a *ch); 120void gv11b_fifo_tsg_verify_status_faulted(struct channel_gk20a *ch);
119u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g); 121u32 gv11b_fifo_get_preempt_timeout(struct gk20a *g);
122
123void gv11b_fifo_init_ramfc_eng_method_buffer(struct gk20a *g,
124 struct channel_gk20a *ch, struct nvgpu_mem *mem);
125void gv11b_userd_writeback_config(struct gk20a *g);
120#endif 126#endif