From 36a488392ff0c615f83ef426af38d36ce1657a1b Mon Sep 17 00:00:00 2001 From: Sami Kiminki Date: Wed, 27 May 2020 14:10:19 +0300 Subject: [PATCH] gpu: nvgpu: add PDI reporting for vgpu Read the PDI from vgpu constants. Bug 2957580 Bug 2992739 Signed-off-by: Sami Kiminki Change-Id: Ief2edeaaa26e284707792f13d218c511fef073af Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2351214 Reviewed-by: automaticguardword Reviewed-by: Lakshmanan M Reviewed-by: Deepak Nibade Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/vgpu/init/init_vgpu.c | 4 ++++ drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/gpu/nvgpu/common/vgpu/init/init_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/init/init_vgpu.c index 7b202c070..4fd0e3205 100644 --- a/drivers/gpu/nvgpu/common/vgpu/init/init_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/init/init_vgpu.c @@ -106,6 +106,7 @@ void vgpu_remove_support_common(struct gk20a *g) int vgpu_init_gpu_characteristics(struct gk20a *g) { int err; + struct vgpu_priv_data *priv = vgpu_get_priv_data(g); nvgpu_log_fn(g, " "); @@ -123,6 +124,9 @@ int vgpu_init_gpu_characteristics(struct gk20a *g) nvgpu_set_enabled(g, NVGPU_SUPPORT_SPARSE_ALLOCS, false); nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE, false); + /* per-device identifier */ + g->per_device_identifier = priv->constants.per_device_identifier; + return 0; } diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h index 847656801..2ce129c35 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h @@ -538,6 +538,7 @@ struct tegra_vgpu_constants_params { u32 l2_en_mask[TEGRA_VGPU_L2_EN_MASK]; /** Max SM configuration count. */ u32 max_sm_diversity_config_count; + u64 per_device_identifier; }; enum {