From b8bfcd4358275be4a11405641defee46d4b33b6b Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Sun, 29 Oct 2017 20:14:12 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1588032 GVS: Gerrit_Virtual_Submit Reviewed-by: svc-mobile-coverity Reviewed-by: Konsta Holtta Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/vgpu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c') diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index f0f05637..14a19f56 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -342,17 +342,17 @@ int vgpu_pm_prepare_poweroff(struct device *dev) static void vgpu_detect_chip(struct gk20a *g) { - struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; + struct nvgpu_gpu_params *p = &g->params; struct vgpu_priv_data *priv = vgpu_get_priv_data(g); - gpu->arch = priv->constants.arch; - gpu->impl = priv->constants.impl; - gpu->rev = priv->constants.rev; + p->gpu_arch = priv->constants.arch; + p->gpu_impl = priv->constants.impl; + p->gpu_rev = priv->constants.rev; gk20a_dbg_info("arch: %x, impl: %x, rev: %x\n", - g->gpu_characteristics.arch, - g->gpu_characteristics.impl, - g->gpu_characteristics.rev); + p->gpu_arch, + p->gpu_impl, + p->gpu_rev); } int vgpu_init_gpu_characteristics(struct gk20a *g) @@ -436,7 +436,7 @@ int vgpu_get_timestamps_zipper(struct gk20a *g, static int vgpu_init_hal(struct gk20a *g) { - u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; + u32 ver = g->params.gpu_arch + g->params.gpu_impl; int err; switch (ver) { -- cgit v1.2.2