summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/hal_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hal_gm20b.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 300f0872..fa7cf368 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -36,11 +36,13 @@
36#include "regops_gm20b.h" 36#include "regops_gm20b.h"
37#include "cde_gm20b.h" 37#include "cde_gm20b.h"
38#include "therm_gm20b.h" 38#include "therm_gm20b.h"
39#include "bus_gm20b.h"
39#include "hal_gm20b.h" 40#include "hal_gm20b.h"
40 41
41#include <nvgpu/debug.h> 42#include <nvgpu/debug.h>
42#include <nvgpu/bug.h> 43#include <nvgpu/bug.h>
43#include <nvgpu/enabled.h> 44#include <nvgpu/enabled.h>
45#include <nvgpu/bus.h>
44 46
45#include <nvgpu/hw/gm20b/hw_proj_gm20b.h> 47#include <nvgpu/hw/gm20b/hw_proj_gm20b.h>
46#include <nvgpu/hw/gm20b/hw_fuse_gm20b.h> 48#include <nvgpu/hw/gm20b/hw_fuse_gm20b.h>
@@ -234,6 +236,13 @@ static const struct gpu_ops gm20b_ops = {
234 .cde = { 236 .cde = {
235 .get_program_numbers = gm20b_cde_get_program_numbers, 237 .get_program_numbers = gm20b_cde_get_program_numbers,
236 }, 238 },
239 .bus = {
240 .init_hw = gk20a_bus_init_hw,
241 .isr = gk20a_bus_isr,
242 .read_ptimer = gk20a_read_ptimer,
243 .get_timestamps_zipper = nvgpu_get_timestamps_zipper,
244 .bar1_bind = gm20b_bus_bar1_bind,
245 },
237#if defined(CONFIG_GK20A_CYCLE_STATS) 246#if defined(CONFIG_GK20A_CYCLE_STATS)
238 .css = { 247 .css = {
239 .enable_snapshot = css_hw_enable_snapshot, 248 .enable_snapshot = css_hw_enable_snapshot,
@@ -263,6 +272,7 @@ int gm20b_init_hal(struct gk20a *g)
263 gops->dbg_session_ops = gm20b_ops.dbg_session_ops; 272 gops->dbg_session_ops = gm20b_ops.dbg_session_ops;
264 gops->debug = gm20b_ops.debug; 273 gops->debug = gm20b_ops.debug;
265 gops->cde = gm20b_ops.cde; 274 gops->cde = gm20b_ops.cde;
275 gops->bus = gm20b_ops.bus;
266#if defined(CONFIG_GK20A_CYCLE_STATS) 276#if defined(CONFIG_GK20A_CYCLE_STATS)
267 gops->css = gm20b_ops.css; 277 gops->css = gm20b_ops.css;
268#endif 278#endif
@@ -302,8 +312,8 @@ int gm20b_init_hal(struct gk20a *g)
302 } 312 }
303 } 313 }
304#endif 314#endif
315
305 g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; 316 g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
306 gk20a_init_bus(gops);
307 gk20a_init_priv_ring(gops); 317 gk20a_init_priv_ring(gops);
308 gm20b_init_gr(gops); 318 gm20b_init_gr(gops);
309 gm20b_init_fb(gops); 319 gm20b_init_fb(gops);