From ae47fa042c2b7379079d54be13df001911954b9e Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Fri, 8 Jun 2018 16:25:49 -0700 Subject: gpu: nvgpu: populate vsm mapping based on nonpes_aware_tpc For gv1xx, kernel smid configuration programming is done based on nonpes aware tpc. For user space to be in sync with hw populate vsm mapping based on nonpes_aware_tpcs. Bug 200405202 Change-Id: Id89291ca64c2118915dc6f18f62e17f411d467b0 Signed-off-by: seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/1744304 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index cda2ce46..73a8131d 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c @@ -782,7 +782,14 @@ static int gk20a_ctrl_vsm_mapping(struct gk20a *g, for (i = 0; i < gr->no_of_sm; i++) { vsms_buf[i].gpc_index = gr->sm_to_cluster[i].gpc_index; - vsms_buf[i].tpc_index = gr->sm_to_cluster[i].tpc_index; + if (g->ops.gr.get_nonpes_aware_tpc) + vsms_buf[i].tpc_index = + g->ops.gr.get_nonpes_aware_tpc(g, + gr->sm_to_cluster[i].gpc_index, + gr->sm_to_cluster[i].tpc_index); + else + vsms_buf[i].tpc_index = + gr->sm_to_cluster[i].tpc_index; } err = copy_to_user((void __user *)(uintptr_t) -- cgit v1.2.2