From d4c33de91937f8189ffba6468578f4aef033c241 Mon Sep 17 00:00:00 2001 From: Lakshmanan M Date: Tue, 6 Apr 2021 15:44:21 +0530 Subject: [PATCH] gpu: nvgpu: Skip determine ppc config for MIG Added a logic to skip the query ppc config when MIG is enabled. JIRA NVGPU-5650 Change-Id: Id95d016cd3fd1e7ee283ebd9e7e8c5ee677eafd3 Signed-off-by: Lakshmanan M Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2510884 Tested-by: mobile promotions Reviewed-by: svcacv Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-cert Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/hal/gr/gr/gr_gk20a.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gk20a.c b/drivers/gpu/nvgpu/hal/gr/gr/gr_gk20a.c index ad8b1576a..2981608c3 100644 --- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gk20a.c +++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gk20a.c @@ -1235,15 +1235,21 @@ int gr_gk20a_find_priv_offset_in_buffer(struct gk20a *g, } gpc_priv_offset = g->ops.gr.ctxsw_prog.get_local_priv_register_ctl_offset(context); - err = gr_gk20a_determine_ppc_configuration(g, context, - &num_ppcs, &ppc_mask, - ®_list_ppc_count); - if (err != 0) { - nvgpu_err(g, "determine ppc configuration failed"); - return err; + if (!nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { + err = gr_gk20a_determine_ppc_configuration(g, context, + &num_ppcs, &ppc_mask, + ®_list_ppc_count); + if (err != 0) { + nvgpu_err(g, + "determine ppc configuration failed"); + return err; + } + } else { + num_ppcs = 0U; + ppc_mask = 0x0U; + reg_list_ppc_count = 0U; } - num_tpcs = g->ops.gr.ctxsw_prog.get_num_tpcs(context); if ((i == gpc_num) && ((tpc_num + 1U) > num_tpcs)) {