gpu: nvgpu: Add GPU arch and impl to common structure

Add GPU architecture and implentation to a new struct nvgpu_gpu_params
which is defined in common header file gk20a/gk20.h.

JIRA NVGPU-259

Change-Id: I9113d188037c9ad7bfc2200e0e41b39cac576985
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1588032
GVS: Gerrit_Virtual_Submit
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 1e5a9d59..1442c19a 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -202,6 +202,9 @@ gk20a_ctrl_ioctl_gpu_characteristics(
 #ifdef CONFIG_TEGRA_19x_GPU
         pgpu->flags |= nvgpu_ctrl_ioctl_gpu_characteristics_flags_t19x(g);
 #endif
+        pgpu->arch = g->params.gpu_arch;
+        pgpu->impl = g->params.gpu_impl;
+        pgpu->rev = g->params.gpu_rev;
 
         if (request->gpu_characteristics_buf_size > 0) {
                 size_t write_size = sizeof(*pgpu);
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index fb5d3614..4f66fc67 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -156,9 +156,10 @@ static int gk20a_restore_registers(struct gk20a *g)
         return 0;
 }
 
-static int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l) {
+static int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l)
+{
         struct gk20a *g = &l->g;
-        u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl;
+        u32 ver = g->params.gpu_arch + g->params.gpu_impl;
 
         switch (ver) {
         case GK20A_GPUID_GM20B:
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
index f0307d96..2b952868 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c
@@ -35,7 +35,7 @@
 static u8 get_perfmon_id(struct nvgpu_pmu *pmu)
 {
         struct gk20a *g = gk20a_from_pmu(pmu);
-        u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl;
+        u32 ver = g->params.gpu_arch + g->params.gpu_impl;
         u8 unit_id;
 
         switch (ver) {