diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-10-29 23:14:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-01 12:36:22 -0400 |
commit | b8bfcd4358275be4a11405641defee46d4b33b6b (patch) | |
tree | 528497c2a78c67224a1f526d184ae52dd5b0b3fa /drivers/gpu/nvgpu/gp106 | |
parent | 68dbfedd4f837d1bf2bab128500140f5d8cfadac (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index c16c058e..d17d5751 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -182,7 +182,7 @@ release_img_fw: | |||
182 | 182 | ||
183 | int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | 183 | int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) |
184 | { | 184 | { |
185 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 185 | u32 ver = g->params.gpu_arch + g->params.gpu_impl; |
186 | struct lsf_ucode_desc_v1 *lsf_desc; | 186 | struct lsf_ucode_desc_v1 *lsf_desc; |
187 | struct nvgpu_firmware *fecs_sig = NULL; | 187 | struct nvgpu_firmware *fecs_sig = NULL; |
188 | int err; | 188 | int err; |
@@ -276,7 +276,7 @@ rel_sig: | |||
276 | 276 | ||
277 | int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | 277 | int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) |
278 | { | 278 | { |
279 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 279 | u32 ver = g->params.gpu_arch + g->params.gpu_impl; |
280 | struct lsf_ucode_desc_v1 *lsf_desc; | 280 | struct lsf_ucode_desc_v1 *lsf_desc; |
281 | struct nvgpu_firmware *gpccs_sig = NULL; | 281 | struct nvgpu_firmware *gpccs_sig = NULL; |
282 | int err; | 282 | int err; |
diff --git a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c index 571f99b7..5dc0f591 100644 --- a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) | 28 | int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) |
29 | { | 29 | { |
30 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 30 | u32 ver = g->params.gpu_arch + g->params.gpu_impl; |
31 | 31 | ||
32 | switch (ver) { | 32 | switch (ver) { |
33 | case NVGPU_GPUID_GP104: | 33 | case NVGPU_GPUID_GP104: |