diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-07 12:40:15 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-08 01:19:05 -0500 |
commit | a51219e526cca5fdee33faf25268662bdd9453cb (patch) | |
tree | c5fb8e63a972dd849eb9492104c32cbdc83a41aa /drivers/gpu/nvgpu/common | |
parent | ac5d3fcf04c9599626fd205aa4e85536390841a1 (diff) |
gpu: nvgpu: Store VBIOS version in g->bios
Store VBIOS version in g->bios instead of GPU characteristics. This
removes a few Linux dependencies from common code, because GPU
characteristics is defined in Linux IOCTL header.
JIRA NVGPU-259
Change-Id: I9aab3d37b7ca000edd59c92b8601a96ee288e2bb
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1593684
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/vbios/bios.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 08a831b9..d3961f79 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -208,6 +208,9 @@ gk20a_ctrl_ioctl_gpu_characteristics( | |||
208 | pgpu->impl = g->params.gpu_impl; | 208 | pgpu->impl = g->params.gpu_impl; |
209 | pgpu->rev = g->params.gpu_rev; | 209 | pgpu->rev = g->params.gpu_rev; |
210 | 210 | ||
211 | pgpu->vbios_version = g->bios.vbios_version; | ||
212 | pgpu->vbios_oem_version = g->bios.vbios_oem_version; | ||
213 | |||
211 | if (request->gpu_characteristics_buf_size > 0) { | 214 | if (request->gpu_characteristics_buf_size > 0) { |
212 | size_t write_size = sizeof(*pgpu); | 215 | size_t write_size = sizeof(*pgpu); |
213 | 216 | ||
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c index 44affbb9..fa700a66 100644 --- a/drivers/gpu/nvgpu/common/vbios/bios.c +++ b/drivers/gpu/nvgpu/common/vbios/bios.c | |||
@@ -350,8 +350,8 @@ static void nvgpu_bios_parse_biosdata(struct gk20a *g, int offset) | |||
350 | biosdata.version, | 350 | biosdata.version, |
351 | biosdata.oem_version); | 351 | biosdata.oem_version); |
352 | 352 | ||
353 | g->gpu_characteristics.vbios_version = biosdata.version; | 353 | g->bios.vbios_version = biosdata.version; |
354 | g->gpu_characteristics.vbios_oem_version = biosdata.oem_version; | 354 | g->bios.vbios_oem_version = biosdata.oem_version; |
355 | } | 355 | } |
356 | 356 | ||
357 | static void nvgpu_bios_parse_nvinit_ptrs(struct gk20a *g, int offset) | 357 | static void nvgpu_bios_parse_nvinit_ptrs(struct gk20a *g, int offset) |