From 098fb0d4dd5aa322446f3d64e76b737db0b1692c Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 26 Aug 2016 10:24:36 -0700 Subject: gpu: nvgpu: Skip calling undefined prod callsbacks Do not call load prod callbacks that are set to NULL. Bug 1799537 Change-Id: Ie951fb71fa8eacd10623abcd058f32db59004c2e Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1208467 (cherry picked from commit c020e16adfa2b2bc2e3e8d0c63527a6089c59906) Reviewed-on: http://git-master/r/1227268 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (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 a3448b2c..eac9456a 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1578,7 +1578,8 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g, 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); + if (g->ops.clock_gating.blcg_gr_load_gating_prod) + 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); if (err) -- cgit v1.2.2