From b30990ea6db564e885d5aee7a1a5ea87a1e5e8ee Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Tue, 21 Jun 2016 10:38:30 -0700 Subject: gpu: nvgpu: set preempt state in golden ctx init Some parameters like gfxp_wfi_timeout are context switched. Once context has been initialized with default values (sw_ctx_load), we need to ensure that preemption state is properly set before saving golden ctx image. Bug 1593548 Jira VFND-1894 Change-Id: Ib1ba03f4ca1606302b1cf1f0738d3610a162a5c6 Signed-off-by: Thomas Fleury Reviewed-on: http://git-master/r/1168662 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 638f47f5..4a3d58cb 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1571,6 +1571,9 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, gk20a_writel(g, sw_ctx_load->l[i].addr, sw_ctx_load->l[i].value); + if (g->ops.gr.init_preemption_state) + g->ops.gr.init_preemption_state(g); + g->ops.clock_gating.blcg_gr_load_gating_prod(g, g->blcg_enabled); err = gr_gk20a_wait_idle(g, end_jiffies, GR_IDLE_CHECK_DEFAULT); -- cgit v1.2.2