summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu
diff options
context:
space:
mode:
authorAparna Das <aparnad@nvidia.com>2018-02-16 20:50:05 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-03-16 10:34:12 -0400
commitae1b86ed4f9bb706a289848829a7909669a538d3 (patch)
tree0c8a0a776500782b08af420b1a2b862787853c72 /drivers/gpu/nvgpu/vgpu
parent34323b559590ed8f1c64ecbb7ffbd838a6478594 (diff)
gpu: nvgpu: add gpu_va to update_hwpm_ctxsw_mode parameters()
It'll allow the function to use fixed mapping. Jira VQRM-2982 Change-Id: I98159c5b199ce1854b1b40704392237cadb71ef2 Signed-off-by: Aparna Das <aparnad@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1660225 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Tested-by: Richard Zhao <rizhao@nvidia.com> Reviewed-by: Nirav Patel <nipatel@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r--drivers/gpu/nvgpu/vgpu/gr_vgpu.c7
-rw-r--r--drivers/gpu/nvgpu/vgpu/gr_vgpu.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index c7996fd9..1c72ca76 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -1026,7 +1026,7 @@ int vgpu_gr_update_smpc_ctxsw_mode(struct gk20a *g,
1026} 1026}
1027 1027
1028int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g, 1028int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g,
1029 struct channel_gk20a *ch, bool enable) 1029 struct channel_gk20a *ch, u64 gpu_va, bool enable)
1030{ 1030{
1031 struct tsg_gk20a *tsg; 1031 struct tsg_gk20a *tsg;
1032 struct nvgpu_gr_ctx *ch_ctx; 1032 struct nvgpu_gr_ctx *ch_ctx;
@@ -1041,6 +1041,11 @@ int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g,
1041 if (!tsg) 1041 if (!tsg)
1042 return -EINVAL; 1042 return -EINVAL;
1043 1043
1044 if (gpu_va) {
1045 nvgpu_err(g, "gpu_va suppose to be allocated by this function.");
1046 return -EINVAL;
1047 }
1048
1044 ch_ctx = &tsg->gr_ctx; 1049 ch_ctx = &tsg->gr_ctx;
1045 pm_ctx = &ch_ctx->pm_ctx; 1050 pm_ctx = &ch_ctx->pm_ctx;
1046 1051
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.h b/drivers/gpu/nvgpu/vgpu/gr_vgpu.h
index 1f55823c..d6b25b97 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.h
@@ -58,7 +58,7 @@ int vgpu_gr_set_sm_debug_mode(struct gk20a *g,
58int vgpu_gr_update_smpc_ctxsw_mode(struct gk20a *g, 58int vgpu_gr_update_smpc_ctxsw_mode(struct gk20a *g,
59 struct channel_gk20a *ch, bool enable); 59 struct channel_gk20a *ch, bool enable);
60int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g, 60int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g,
61 struct channel_gk20a *ch, bool enable); 61 struct channel_gk20a *ch, u64 gpu_va, bool enable);
62int vgpu_gr_clear_sm_error_state(struct gk20a *g, 62int vgpu_gr_clear_sm_error_state(struct gk20a *g,
63 struct channel_gk20a *ch, u32 sm_id); 63 struct channel_gk20a *ch, u32 sm_id);
64int vgpu_gr_suspend_contexts(struct gk20a *g, 64int vgpu_gr_suspend_contexts(struct gk20a *g,