From ea7eaed8434f2ad6229a09b66607937bd1a151ae Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Fri, 9 Feb 2018 13:44:45 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1655279 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 8 +++++--- drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers') 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) if (err) goto clean_up; - err = g->ops.ltc.init_comptags(g, gr); - if (err) - goto clean_up; + if (g->ops.ltc.init_comptags) { + err = g->ops.ltc.init_comptags(g, gr); + if (err) + goto clean_up; + } err = gr_gk20a_init_zcull(g, gr); 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 = { .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry, .init_cbc = NULL, .init_fs_state = gv11b_ltc_init_fs_state, - .init_comptags = gp10b_ltc_init_comptags, .cbc_ctrl = gp10b_ltc_cbc_ctrl, .isr = gv11b_ltc_isr, .cbc_fix_config = NULL, -- cgit v1.2.2