diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index b06ed9e6..e783f8d0 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -76,8 +76,6 @@ static void gr_gk20a_free_channel_patch_ctx(struct channel_gk20a *c); | |||
76 | /* golden ctx image */ | 76 | /* golden ctx image */ |
77 | static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, | 77 | static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, |
78 | struct channel_gk20a *c); | 78 | struct channel_gk20a *c); |
79 | static int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | ||
80 | struct channel_gk20a *c); | ||
81 | 79 | ||
82 | void gk20a_fecs_dump_falcon_stats(struct gk20a *g) | 80 | void gk20a_fecs_dump_falcon_stats(struct gk20a *g) |
83 | { | 81 | { |
@@ -1656,7 +1654,7 @@ int gr_gk20a_update_smpc_ctxsw_mode(struct gk20a *g, | |||
1656 | } | 1654 | } |
1657 | 1655 | ||
1658 | /* load saved fresh copy of gloden image into channel gr_ctx */ | 1656 | /* load saved fresh copy of gloden image into channel gr_ctx */ |
1659 | static int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | 1657 | int gr_gk20a_load_golden_ctx_image(struct gk20a *g, |
1660 | struct channel_gk20a *c) | 1658 | struct channel_gk20a *c) |
1661 | { | 1659 | { |
1662 | struct gr_gk20a *gr = &g->gr; | 1660 | struct gr_gk20a *gr = &g->gr; |
@@ -2786,7 +2784,7 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a *c, | |||
2786 | gk20a_dbg_fn(""); | 2784 | gk20a_dbg_fn(""); |
2787 | 2785 | ||
2788 | /* an address space needs to have been bound at this point.*/ | 2786 | /* an address space needs to have been bound at this point.*/ |
2789 | if (!gk20a_channel_as_bound(c)) { | 2787 | if (!gk20a_channel_as_bound(c) && !c->vm) { |
2790 | gk20a_err(dev_from_gk20a(g), | 2788 | gk20a_err(dev_from_gk20a(g), |
2791 | "not bound to address space at time" | 2789 | "not bound to address space at time" |
2792 | " of grctx allocation"); | 2790 | " of grctx allocation"); |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 3376747b..dadcbca2 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -316,6 +316,8 @@ struct gk20a_ctxsw_bootloader_desc { | |||
316 | }; | 316 | }; |
317 | 317 | ||
318 | struct gpu_ops; | 318 | struct gpu_ops; |
319 | int gr_gk20a_load_golden_ctx_image(struct gk20a *g, | ||
320 | struct channel_gk20a *c); | ||
319 | void gk20a_init_gr(struct gk20a *g); | 321 | void gk20a_init_gr(struct gk20a *g); |
320 | void gk20a_init_gr_ops(struct gpu_ops *gops); | 322 | void gk20a_init_gr_ops(struct gpu_ops *gops); |
321 | int gk20a_init_gr_support(struct gk20a *g); | 323 | int gk20a_init_gr_support(struct gk20a *g); |