diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-02-14 03:58:54 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-15 22:33:29 -0500 |
commit | a9e1a6c70af1d7414a3d64423600ca37eba0f750 (patch) | |
tree | 5c7db4714829db21130a717ad804c39c7b14a427 /drivers/gpu/nvgpu/gp106 | |
parent | d465504534b2ec7ab0be190fc98b24e1b77634e2 (diff) |
gpu: nvgpu: Remove ACR gm204/gm206 support
- Remove ACR gm204/gm206 support as no more support
required Maxwell dGPU.
-Moved required ACR interface to gp106 from gm206
-Deleted acr_gm206.c/h files & removed its involvement
from dependent files.
Change-Id: I9cb7ce8f7ef8bb6fcc7515e644ffb11b774389f4
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1304556
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.h | 41 |
2 files changed, 40 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index f5a4053b..847a0b00 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -22,8 +22,8 @@ | |||
22 | #include "gk20a/gk20a.h" | 22 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/pmu_gk20a.h" | 23 | #include "gk20a/pmu_gk20a.h" |
24 | 24 | ||
25 | #include "gm206/acr_gm206.h" | ||
26 | #include "gm20b/acr_gm20b.h" | 25 | #include "gm20b/acr_gm20b.h" |
26 | #include "gp106/acr_gp106.h" | ||
27 | #include "gp106/pmu_gp106.h" | 27 | #include "gp106/pmu_gp106.h" |
28 | 28 | ||
29 | #include "sec2_gp106.h" | 29 | #include "sec2_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.h b/drivers/gpu/nvgpu/gp106/acr_gp106.h index cd555eb8..dee01f6b 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.h +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -15,13 +15,50 @@ | |||
15 | #define __ACR_GP106_H_ | 15 | #define __ACR_GP106_H_ |
16 | 16 | ||
17 | #include "gm20b/acr_gm20b.h" | 17 | #include "gm20b/acr_gm20b.h" |
18 | #include "gm206/acr_gm206.h" | ||
19 | 18 | ||
20 | #define GP106_FECS_UCODE_SIG "gp106/fecs_sig.bin" | 19 | #define GP106_FECS_UCODE_SIG "gp106/fecs_sig.bin" |
21 | #define GP106_GPCCS_UCODE_SIG "gp106/gpccs_sig.bin" | 20 | #define GP106_GPCCS_UCODE_SIG "gp106/gpccs_sig.bin" |
22 | #define GP104_FECS_UCODE_SIG "gp104/fecs_sig.bin" | 21 | #define GP104_FECS_UCODE_SIG "gp104/fecs_sig.bin" |
23 | #define GP104_GPCCS_UCODE_SIG "gp104/gpccs_sig.bin" | 22 | #define GP104_GPCCS_UCODE_SIG "gp104/gpccs_sig.bin" |
24 | 23 | ||
24 | struct loader_config_v1 { | ||
25 | u32 reserved; | ||
26 | u32 dma_idx; | ||
27 | struct falc_u64 code_dma_base; | ||
28 | u32 code_size_total; | ||
29 | u32 code_size_to_load; | ||
30 | u32 code_entry_point; | ||
31 | struct falc_u64 data_dma_base; | ||
32 | u32 data_size; | ||
33 | struct falc_u64 overlay_dma_base; | ||
34 | u32 argc; | ||
35 | u32 argv; | ||
36 | }; | ||
37 | |||
38 | struct flcn_bl_dmem_desc_v1 { | ||
39 | u32 reserved[4]; /*Should be the first element..*/ | ||
40 | u32 signature[4]; /*Should be the first element..*/ | ||
41 | u32 ctx_dma; | ||
42 | struct falc_u64 code_dma_base; | ||
43 | u32 non_sec_code_off; | ||
44 | u32 non_sec_code_size; | ||
45 | u32 sec_code_off; | ||
46 | u32 sec_code_size; | ||
47 | u32 code_entry_point; | ||
48 | struct falc_u64 data_dma_base; | ||
49 | u32 data_size; | ||
50 | u32 argc; | ||
51 | u32 argv; | ||
52 | }; | ||
53 | |||
54 | /*! | ||
55 | * Union of all supported structures used by bootloaders. | ||
56 | */ | ||
57 | union flcn_bl_generic_desc_v1 { | ||
58 | struct flcn_bl_dmem_desc_v1 bl_dmem_desc_v1; | ||
59 | struct loader_config_v1 loader_cfg_v1; | ||
60 | }; | ||
61 | |||
25 | struct lsf_ucode_desc_v1 { | 62 | struct lsf_ucode_desc_v1 { |
26 | u8 prd_keys[2][16]; | 63 | u8 prd_keys[2][16]; |
27 | u8 dbg_keys[2][16]; | 64 | u8 dbg_keys[2][16]; |