summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux')
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c3
-rw-r--r--drivers/gpu/nvgpu/common/linux/module.c5
2 files changed, 6 insertions, 2 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(
202#ifdef CONFIG_TEGRA_19x_GPU 202#ifdef CONFIG_TEGRA_19x_GPU
203 pgpu->flags |= nvgpu_ctrl_ioctl_gpu_characteristics_flags_t19x(g); 203 pgpu->flags |= nvgpu_ctrl_ioctl_gpu_characteristics_flags_t19x(g);
204#endif 204#endif
205 pgpu->arch = g->params.gpu_arch;
206 pgpu->impl = g->params.gpu_impl;
207 pgpu->rev = g->params.gpu_rev;
205 208
206 if (request->gpu_characteristics_buf_size > 0) { 209 if (request->gpu_characteristics_buf_size > 0) {
207 size_t write_size = sizeof(*pgpu); 210 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)
156 return 0; 156 return 0;
157} 157}
158 158
159static int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l) { 159static int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l)
160{
160 struct gk20a *g = &l->g; 161 struct gk20a *g = &l->g;
161 u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; 162 u32 ver = g->params.gpu_arch + g->params.gpu_impl;
162 163
163 switch (ver) { 164 switch (ver) {
164 case GK20A_GPUID_GM20B: 165 case GK20A_GPUID_GM20B: