diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-08-26 13:24:36 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-09-29 16:17:50 -0400 |
| commit | 098fb0d4dd5aa322446f3d64e76b737db0b1692c (patch) | |
| tree | 7f966fc806119b93b7ffcaefc966f0c895433148 /drivers | |
| parent | b17d9708c9e9930778de43de1edf1385acb13ebd (diff) | |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1208467
(cherry picked from commit c020e16adfa2b2bc2e3e8d0c63527a6089c59906)
Reviewed-on: http://git-master/r/1227268
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, | |||
| 1578 | if (g->ops.gr.init_preemption_state) | 1578 | if (g->ops.gr.init_preemption_state) |
| 1579 | g->ops.gr.init_preemption_state(g); | 1579 | g->ops.gr.init_preemption_state(g); |
| 1580 | 1580 | ||
| 1581 | g->ops.clock_gating.blcg_gr_load_gating_prod(g, g->blcg_enabled); | 1581 | if (g->ops.clock_gating.blcg_gr_load_gating_prod) |
| 1582 | g->ops.clock_gating.blcg_gr_load_gating_prod(g, g->blcg_enabled); | ||
| 1582 | 1583 | ||
| 1583 | err = gr_gk20a_wait_idle(g, end_jiffies, GR_IDLE_CHECK_DEFAULT); | 1584 | err = gr_gk20a_wait_idle(g, end_jiffies, GR_IDLE_CHECK_DEFAULT); |
| 1584 | if (err) | 1585 | if (err) |