From 488a2c38d17cd13b4453678d81c92db0664dd077 Mon Sep 17 00:00:00 2001 From: sujeet baranwal Date: Mon, 5 Oct 2015 14:15:54 -0700 Subject: gpu: nvgpu: Avoid resetting CDE flag While loading the context, erstwhile set CDE flag was being overwritten by copying code of golden context, thus losing the information. This was not letting the CDE info reach to the ucode, and T1 was not configured to 128B mem access. Bug 200096226 Change-Id: I5ceb234a62450ff7875aeba05ec616758cb319d9 Signed-off-by: sujeet baranwal Reviewed-on: http://git-master/r/811767 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 25679c4c..ea06bd20 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1622,12 +1622,12 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, if (!ctx_ptr) return -ENOMEM; - if (g->ops.gr.enable_cde_in_fecs && c->cde) - g->ops.gr.enable_cde_in_fecs(ctx_ptr); - for (i = 0; i < gr->ctx_vars.golden_image_size / 4; i++) gk20a_mem_wr32(ctx_ptr, i, gr->ctx_vars.local_golden_image[i]); + if (g->ops.gr.enable_cde_in_fecs && c->cde) + g->ops.gr.enable_cde_in_fecs(ctx_ptr); + gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_num_save_ops_o(), 0, 0); gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_num_restore_ops_o(), 0, 0); -- cgit v1.2.2