diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/acr.h | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/acr.h b/drivers/gpu/nvgpu/acr.h index 2a3ece7b..dc463133 100644 --- a/drivers/gpu/nvgpu/acr.h +++ b/drivers/gpu/nvgpu/acr.h | |||
@@ -17,6 +17,9 @@ | |||
17 | #include "gm20b/mm_gm20b.h" | 17 | #include "gm20b/mm_gm20b.h" |
18 | #include "gm20b/acr_gm20b.h" | 18 | #include "gm20b/acr_gm20b.h" |
19 | #include "gm206/acr_gm206.h" | 19 | #include "gm206/acr_gm206.h" |
20 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
21 | #include "acr_t18x.h" | ||
22 | #endif | ||
20 | 23 | ||
21 | struct acr_desc { | 24 | struct acr_desc { |
22 | struct mem_desc ucode_blob; | 25 | struct mem_desc ucode_blob; |
@@ -26,7 +29,12 @@ struct acr_desc { | |||
26 | struct acr_fw_header *fw_hdr; | 29 | struct acr_fw_header *fw_hdr; |
27 | u32 pmu_args; | 30 | u32 pmu_args; |
28 | const struct firmware *acr_fw; | 31 | const struct firmware *acr_fw; |
29 | struct flcn_acr_desc *acr_dmem_desc; | 32 | union{ |
33 | struct flcn_acr_desc *acr_dmem_desc; | ||
34 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | ||
35 | struct flcn_acr_desc_v1 *acr_dmem_desc_v1; | ||
36 | #endif | ||
37 | }; | ||
30 | struct mem_desc acr_ucode; | 38 | struct mem_desc acr_ucode; |
31 | const struct firmware *hsbl_fw; | 39 | const struct firmware *hsbl_fw; |
32 | struct mem_desc hsbl_ucode; | 40 | struct mem_desc hsbl_ucode; |
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.h b/drivers/gpu/nvgpu/gm20b/acr_gm20b.h index 51492827..fb61e366 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.h | |||
@@ -55,7 +55,7 @@ | |||
55 | #define LSF_FALCON_ID_RESERVED (1) | 55 | #define LSF_FALCON_ID_RESERVED (1) |
56 | #define LSF_FALCON_ID_FECS (2) | 56 | #define LSF_FALCON_ID_FECS (2) |
57 | #define LSF_FALCON_ID_GPCCS (3) | 57 | #define LSF_FALCON_ID_GPCCS (3) |
58 | #define LSF_FALCON_ID_END (4) | 58 | #define LSF_FALCON_ID_END (11) |
59 | #define LSF_FALCON_ID_INVALID (0xFFFFFFFF) | 59 | #define LSF_FALCON_ID_INVALID (0xFFFFFFFF) |
60 | 60 | ||
61 | /*! | 61 | /*! |