diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-06-04 13:54:11 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-06-10 12:50:08 -0400 |
commit | 89bcbe7d315b63a62fbda706986d72cbe9588b5d (patch) | |
tree | 1a2a2bfbe532744e3615602949b80513aac87aef | |
parent | c5367d735066b67798686ccf304753fb52fccb68 (diff) |
gpu: nvgpu: Fix prefix and export commit attrib cb
Change-Id: I8309837978b069fa5d416b7713654d6b71543c77
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/755212
Reviewed-by: Automatic_Commit_Validation_User
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 74a43a6c..20eaae5f 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -113,9 +113,9 @@ static int gr_gm20b_calc_global_ctx_buffer_size(struct gk20a *g) | |||
113 | return size; | 113 | return size; |
114 | } | 114 | } |
115 | 115 | ||
116 | static void gr_gk20a_commit_global_attrib_cb(struct gk20a *g, | 116 | void gr_gm20b_commit_global_attrib_cb(struct gk20a *g, |
117 | struct channel_ctx_gk20a *ch_ctx, | 117 | struct channel_ctx_gk20a *ch_ctx, |
118 | u64 addr, bool patch) | 118 | u64 addr, bool patch) |
119 | { | 119 | { |
120 | gr_gk20a_ctx_patch_write(g, ch_ctx, gr_gpcs_setup_attrib_cb_base_r(), | 120 | gr_gk20a_ctx_patch_write(g, ch_ctx, gr_gpcs_setup_attrib_cb_base_r(), |
121 | gr_gpcs_setup_attrib_cb_base_addr_39_12_f(addr) | | 121 | gr_gpcs_setup_attrib_cb_base_addr_39_12_f(addr) | |
@@ -1073,7 +1073,7 @@ void gm20b_init_gr(struct gpu_ops *gops) | |||
1073 | gops->gr.cb_size_default = gr_gm20b_cb_size_default; | 1073 | gops->gr.cb_size_default = gr_gm20b_cb_size_default; |
1074 | gops->gr.calc_global_ctx_buffer_size = | 1074 | gops->gr.calc_global_ctx_buffer_size = |
1075 | gr_gm20b_calc_global_ctx_buffer_size; | 1075 | gr_gm20b_calc_global_ctx_buffer_size; |
1076 | gops->gr.commit_global_attrib_cb = gr_gk20a_commit_global_attrib_cb; | 1076 | gops->gr.commit_global_attrib_cb = gr_gm20b_commit_global_attrib_cb; |
1077 | gops->gr.commit_global_bundle_cb = gr_gm20b_commit_global_bundle_cb; | 1077 | gops->gr.commit_global_bundle_cb = gr_gm20b_commit_global_bundle_cb; |
1078 | gops->gr.commit_global_cb_manager = gr_gm20b_commit_global_cb_manager; | 1078 | gops->gr.commit_global_cb_manager = gr_gm20b_commit_global_cb_manager; |
1079 | gops->gr.commit_global_pagepool = gr_gm20b_commit_global_pagepool; | 1079 | gops->gr.commit_global_pagepool = gr_gm20b_commit_global_pagepool; |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h index fd109eec..646c16d9 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h | |||
@@ -43,4 +43,7 @@ enum { | |||
43 | 43 | ||
44 | #define NVA297_SET_SHADER_EXCEPTIONS_ENABLE_FALSE 0 | 44 | #define NVA297_SET_SHADER_EXCEPTIONS_ENABLE_FALSE 0 |
45 | void gm20b_init_gr(struct gpu_ops *gops); | 45 | void gm20b_init_gr(struct gpu_ops *gops); |
46 | void gr_gm20b_commit_global_attrib_cb(struct gk20a *g, | ||
47 | struct channel_ctx_gk20a *ch_ctx, | ||
48 | u64 addr, bool patch); | ||
46 | #endif | 49 | #endif |