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/hal.c4
-rw-r--r--drivers/gpu/nvgpu/gk20a/hal_gk20a.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index b813541a..de234972 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -297,6 +297,7 @@ struct gpu_ops {
297 int (*init_clk_support)(struct gk20a *g); 297 int (*init_clk_support)(struct gk20a *g);
298 int (*suspend_clk_support)(struct gk20a *g); 298 int (*suspend_clk_support)(struct gk20a *g);
299 } clk; 299 } clk;
300 bool privsecurity;
300}; 301};
301 302
302struct gk20a { 303struct gk20a {
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 1aae0304..8d1a29dd 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -26,7 +26,9 @@ int gpu_init_hal(struct gk20a *g)
26 gk20a_init_hal(&g->ops); 26 gk20a_init_hal(&g->ops);
27 break; 27 break;
28 case GK20A_GPUID_GM20B: 28 case GK20A_GPUID_GM20B:
29 gm20b_init_hal(&g->ops); 29 gk20a_dbg_info("gm20b detected");
30 if (gm20b_init_hal(&g->ops))
31 return -ENODEV;
30 break; 32 break;
31 default: 33 default:
32 gk20a_err(&g->dev->dev, "no support for %x", ver); 34 gk20a_err(&g->dev->dev, "no support for %x", ver);
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
index 3dae9450..1b8157f1 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
@@ -44,6 +44,7 @@ struct gpu_ops gk20a_ops = {
44int gk20a_init_hal(struct gpu_ops *gops) 44int gk20a_init_hal(struct gpu_ops *gops)
45{ 45{
46 *gops = gk20a_ops; 46 *gops = gk20a_ops;
47 gops->privsecurity = 0;
47 gk20a_init_ltc(gops); 48 gk20a_init_ltc(gops);
48 gk20a_init_gr_ops(gops); 49 gk20a_init_gr_ops(gops);
49 gk20a_init_fb(gops); 50 gk20a_init_fb(gops);