summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r--drivers/gpu/nvgpu/gm20b/fifo_gm20b.c4
-rw-r--r--drivers/gpu/nvgpu/gm20b/mm_gm20b.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index b5b9c52b..07ad322a 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -15,6 +15,7 @@
15 15
16#include <linux/delay.h> 16#include <linux/delay.h>
17#include "gk20a/gk20a.h" 17#include "gk20a/gk20a.h"
18#include "gk20a/fifo_gk20a.h"
18#include "fifo_gm20b.h" 19#include "fifo_gm20b.h"
19#include "hw_ccsr_gm20b.h" 20#include "hw_ccsr_gm20b.h"
20#include "hw_ram_gm20b.h" 21#include "hw_ram_gm20b.h"
@@ -133,6 +134,7 @@ static void gm20b_device_info_data_parse(struct gk20a *g,
133} 134}
134void gm20b_init_fifo(struct gpu_ops *gops) 135void gm20b_init_fifo(struct gpu_ops *gops)
135{ 136{
137 gops->fifo.init_fifo_setup_hw = gk20a_init_fifo_setup_hw;
136 gops->fifo.bind_channel = channel_gm20b_bind; 138 gops->fifo.bind_channel = channel_gm20b_bind;
137 gops->fifo.unbind_channel = channel_gk20a_unbind; 139 gops->fifo.unbind_channel = channel_gk20a_unbind;
138 gops->fifo.disable_channel = channel_gk20a_disable; 140 gops->fifo.disable_channel = channel_gk20a_disable;
@@ -142,6 +144,8 @@ void gm20b_init_fifo(struct gpu_ops *gops)
142 gops->fifo.setup_ramfc = channel_gk20a_setup_ramfc; 144 gops->fifo.setup_ramfc = channel_gk20a_setup_ramfc;
143 gops->fifo.channel_set_priority = gk20a_channel_set_priority; 145 gops->fifo.channel_set_priority = gk20a_channel_set_priority;
144 gops->fifo.channel_set_timeslice = gk20a_channel_set_timeslice; 146 gops->fifo.channel_set_timeslice = gk20a_channel_set_timeslice;
147 gops->fifo.userd_gp_get = gk20a_userd_gp_get;
148 gops->fifo.userd_gp_put = gk20a_userd_gp_put;
145 149
146 gops->fifo.preempt_channel = gk20a_fifo_preempt_channel; 150 gops->fifo.preempt_channel = gk20a_fifo_preempt_channel;
147 gops->fifo.preempt_tsg = gk20a_fifo_preempt_tsg; 151 gops->fifo.preempt_tsg = gk20a_fifo_preempt_tsg;
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
index 8aa14662..36d1192a 100644
--- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
@@ -163,6 +163,11 @@ static int gm20b_mm_bar1_bind(struct gk20a *g, struct mem_desc *bar1_inst)
163 return retry ? -EINVAL : 0; 163 return retry ? -EINVAL : 0;
164} 164}
165 165
166static bool gm20b_mm_is_bar1_supported(struct gk20a *g)
167{
168 return true;
169}
170
166void gm20b_init_mm(struct gpu_ops *gops) 171void gm20b_init_mm(struct gpu_ops *gops)
167{ 172{
168 gops->mm.support_sparse = gm20b_mm_support_sparse; 173 gops->mm.support_sparse = gm20b_mm_support_sparse;
@@ -186,4 +191,5 @@ void gm20b_init_mm(struct gpu_ops *gops)
186 gops->mm.init_pdb = gk20a_mm_init_pdb; 191 gops->mm.init_pdb = gk20a_mm_init_pdb;
187 gops->mm.init_mm_setup_hw = gk20a_init_mm_setup_hw; 192 gops->mm.init_mm_setup_hw = gk20a_init_mm_setup_hw;
188 gops->mm.bar1_bind = gm20b_mm_bar1_bind; 193 gops->mm.bar1_bind = gm20b_mm_bar1_bind;
194 gops->mm.is_bar1_supported = gm20b_mm_is_bar1_supported;
189} 195}