diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 18f00c63..19d9cffc 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -767,7 +767,7 @@ static int gr_gk20a_commit_global_cb_manager(struct gk20a *g, | |||
767 | struct channel_gk20a *c, bool patch) | 767 | struct channel_gk20a *c, bool patch) |
768 | { | 768 | { |
769 | struct gr_gk20a *gr = &g->gr; | 769 | struct gr_gk20a *gr = &g->gr; |
770 | struct channel_ctx_gk20a *ch_ctx = NULL; | 770 | struct channel_ctx_gk20a *ch_ctx = &c->ch_ctx; |
771 | u32 attrib_offset_in_chunk = 0; | 771 | u32 attrib_offset_in_chunk = 0; |
772 | u32 alpha_offset_in_chunk = 0; | 772 | u32 alpha_offset_in_chunk = 0; |
773 | u32 pd_ab_max_output; | 773 | u32 pd_ab_max_output; |
@@ -777,14 +777,6 @@ static int gr_gk20a_commit_global_cb_manager(struct gk20a *g, | |||
777 | 777 | ||
778 | gk20a_dbg_fn(""); | 778 | gk20a_dbg_fn(""); |
779 | 779 | ||
780 | if (patch) { | ||
781 | int err; | ||
782 | ch_ctx = &c->ch_ctx; | ||
783 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); | ||
784 | if (err) | ||
785 | return err; | ||
786 | } | ||
787 | |||
788 | gr_gk20a_ctx_patch_write(g, ch_ctx, gr_ds_tga_constraintlogic_r(), | 780 | gr_gk20a_ctx_patch_write(g, ch_ctx, gr_ds_tga_constraintlogic_r(), |
789 | gr_ds_tga_constraintlogic_beta_cbsize_f(gr->attrib_cb_default_size) | | 781 | gr_ds_tga_constraintlogic_beta_cbsize_f(gr->attrib_cb_default_size) | |
790 | gr_ds_tga_constraintlogic_alpha_cbsize_f(gr->alpha_cb_default_size), | 782 | gr_ds_tga_constraintlogic_alpha_cbsize_f(gr->alpha_cb_default_size), |
@@ -831,9 +823,6 @@ static int gr_gk20a_commit_global_cb_manager(struct gk20a *g, | |||
831 | } | 823 | } |
832 | } | 824 | } |
833 | 825 | ||
834 | if (patch) | ||
835 | gr_gk20a_ctx_patch_write_end(g, ch_ctx); | ||
836 | |||
837 | return 0; | 826 | return 0; |
838 | } | 827 | } |
839 | 828 | ||
@@ -891,6 +880,7 @@ static int gr_gk20a_commit_global_ctx_buffers(struct gk20a *g, | |||
891 | 880 | ||
892 | gk20a_dbg_info("attrib cb addr : 0x%016llx", addr); | 881 | gk20a_dbg_info("attrib cb addr : 0x%016llx", addr); |
893 | g->ops.gr.commit_global_attrib_cb(g, ch_ctx, addr, patch); | 882 | g->ops.gr.commit_global_attrib_cb(g, ch_ctx, addr, patch); |
883 | g->ops.gr.commit_global_cb_manager(g, c, patch); | ||
894 | 884 | ||
895 | if (patch) | 885 | if (patch) |
896 | gr_gk20a_ctx_patch_write_end(g, ch_ctx); | 886 | gr_gk20a_ctx_patch_write_end(g, ch_ctx); |
@@ -4184,7 +4174,6 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) | |||
4184 | gr_fe_go_idle_timeout_count_disabled_f()); | 4174 | gr_fe_go_idle_timeout_count_disabled_f()); |
4185 | 4175 | ||
4186 | /* override a few ctx state registers */ | 4176 | /* override a few ctx state registers */ |
4187 | g->ops.gr.commit_global_cb_manager(g, NULL, false); | ||
4188 | gr_gk20a_commit_global_timeslice(g, NULL, false); | 4177 | gr_gk20a_commit_global_timeslice(g, NULL, false); |
4189 | 4178 | ||
4190 | /* floorsweep anything left */ | 4179 | /* floorsweep anything left */ |