diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-08-29 12:16:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-09-08 23:05:49 -0400 |
commit | f56ed459dde2a292b3af0dd4deb96b1090eb53a2 (patch) | |
tree | e69a53c34f6b89805ef74a63ecfacede0d864cc5 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | a0dd3ee5becb8e0f91e46654e25619b55655c017 (diff) |
gpu: nvgpu: Skip calling undefined prod callbacks
Fix rest of code to not call prod callbacks that are set to NULL.
Bug 1799537
Change-Id: I756bb1f7ef58ba753ac43a2be6f125107be3cf34
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1209133
(cherry picked from commit 5f4d7b42b6101407fde8c4a7dcdd3633eca85ae5)
Reviewed-on: http://git-master/r/1217297
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index c5bc5bda..ee42f4d7 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -1323,12 +1323,15 @@ static bool gk20a_fifo_handle_mmu_fault( | |||
1323 | /* Disable power management */ | 1323 | /* Disable power management */ |
1324 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) | 1324 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) |
1325 | gk20a_pmu_disable_elpg(g); | 1325 | gk20a_pmu_disable_elpg(g); |
1326 | g->ops.clock_gating.slcg_gr_load_gating_prod(g, | 1326 | if (g->ops.clock_gating.slcg_gr_load_gating_prod) |
1327 | false); | 1327 | g->ops.clock_gating.slcg_gr_load_gating_prod(g, |
1328 | g->ops.clock_gating.slcg_perf_load_gating_prod(g, | 1328 | false); |
1329 | false); | 1329 | if (g->ops.clock_gating.slcg_perf_load_gating_prod) |
1330 | g->ops.clock_gating.slcg_ltc_load_gating_prod(g, | 1330 | g->ops.clock_gating.slcg_perf_load_gating_prod(g, |
1331 | false); | 1331 | false); |
1332 | if (g->ops.clock_gating.slcg_ltc_load_gating_prod) | ||
1333 | g->ops.clock_gating.slcg_ltc_load_gating_prod(g, | ||
1334 | false); | ||
1332 | 1335 | ||
1333 | gr_gk20a_init_cg_mode(g, ELCG_MODE, ELCG_RUN); | 1336 | gr_gk20a_init_cg_mode(g, ELCG_MODE, ELCG_RUN); |
1334 | 1337 | ||