diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-02-09 16:44:45 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-02-23 08:04:30 -0500 |
commit | ea7eaed8434f2ad6229a09b66607937bd1a151ae (patch) | |
tree | d3928b6d75227bf96ac9998356f40c72c490a466 | |
parent | 7a9c2f68f36ea4eb893cb2061ad82ddce9138e8b (diff) |
gpu: nvgpu: Don't alloc comptags on GV100
We don't have compression enabled on GV100 so it does not make sense
to allocate a huge CBC for this device.
Change-Id: I0ff908571f28c2ba6f439b0989398bf68dce16f9
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1655279
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 0e21f749..ef26a74e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -4776,9 +4776,11 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g) | |||
4776 | if (err) | 4776 | if (err) |
4777 | goto clean_up; | 4777 | goto clean_up; |
4778 | 4778 | ||
4779 | err = g->ops.ltc.init_comptags(g, gr); | 4779 | if (g->ops.ltc.init_comptags) { |
4780 | if (err) | 4780 | err = g->ops.ltc.init_comptags(g, gr); |
4781 | goto clean_up; | 4781 | if (err) |
4782 | goto clean_up; | ||
4783 | } | ||
4782 | 4784 | ||
4783 | err = gr_gk20a_init_zcull(g, gr); | 4785 | err = gr_gk20a_init_zcull(g, gr); |
4784 | if (err) | 4786 | if (err) |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index c10df2cb..6f4ab875 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -267,7 +267,6 @@ static const struct gpu_ops gv100_ops = { | |||
267 | .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry, | 267 | .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry, |
268 | .init_cbc = NULL, | 268 | .init_cbc = NULL, |
269 | .init_fs_state = gv11b_ltc_init_fs_state, | 269 | .init_fs_state = gv11b_ltc_init_fs_state, |
270 | .init_comptags = gp10b_ltc_init_comptags, | ||
271 | .cbc_ctrl = gp10b_ltc_cbc_ctrl, | 270 | .cbc_ctrl = gp10b_ltc_cbc_ctrl, |
272 | .isr = gv11b_ltc_isr, | 271 | .isr = gv11b_ltc_isr, |
273 | .cbc_fix_config = NULL, | 272 | .cbc_fix_config = NULL, |