From a51219e526cca5fdee33faf25268662bdd9453cb Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 7 Nov 2017 09:40:15 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1593684 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 3 +++ drivers/gpu/nvgpu/common/vbios/bios.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/common') 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( pgpu->impl = g->params.gpu_impl; pgpu->rev = g->params.gpu_rev; + pgpu->vbios_version = g->bios.vbios_version; + pgpu->vbios_oem_version = g->bios.vbios_oem_version; + if (request->gpu_characteristics_buf_size > 0) { size_t write_size = sizeof(*pgpu); 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) biosdata.version, biosdata.oem_version); - g->gpu_characteristics.vbios_version = biosdata.version; - g->gpu_characteristics.vbios_oem_version = biosdata.oem_version; + g->bios.vbios_version = biosdata.version; + g->bios.vbios_oem_version = biosdata.oem_version; } static void nvgpu_bios_parse_nvinit_ptrs(struct gk20a *g, int offset) -- cgit v1.2.2