diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-08-24 18:09:15 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-09-12 19:06:44 -0400 |
| commit | 2d35eee68f5cec18259a14c6573c172948951194 (patch) | |
| tree | 6cb492c54070dae98cfeb0ade39074e038feae98 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
| parent | 589179ad00b78485a071131b5f08c874e8b3ef84 (diff) | |
gpu: nvgpu: Call init_cbc only when defined
Call init_cbc only when it contains a non-NULL pointer.
Bug 1799537
Change-Id: Ic23f264e10daff30365bf3cf86ac9c155f50e497
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1208008
(cherry picked from commit ec69fa15c32f49d96939fd9a672faec45e078dfa)
Reviewed-on: http://git-master/r/1217298
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
| -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 28236cb9..4c650520 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
| @@ -4576,7 +4576,8 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) | |||
| 4576 | 4576 | ||
| 4577 | gr_gk20a_load_zbc_table(g, gr); | 4577 | gr_gk20a_load_zbc_table(g, gr); |
| 4578 | 4578 | ||
| 4579 | g->ops.ltc.init_cbc(g, gr); | 4579 | if (g->ops.ltc.init_cbc) |
| 4580 | g->ops.ltc.init_cbc(g, gr); | ||
| 4580 | 4581 | ||
| 4581 | /* load ctx init */ | 4582 | /* load ctx init */ |
| 4582 | for (i = 0; i < sw_ctx_load->count; i++) | 4583 | for (i = 0; i < sw_ctx_load->count; i++) |