diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 9 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm206/acr_gm206.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index fd27ab5c..78a37436 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -38,7 +38,7 @@ | |||
38 | #define APP_VERSION_NC_1 20313802 | 38 | #define APP_VERSION_NC_1 20313802 |
39 | #define APP_VERSION_NC_0 20360931 | 39 | #define APP_VERSION_NC_0 20360931 |
40 | #define APP_VERSION_GM206 20652057 | 40 | #define APP_VERSION_GM206 20652057 |
41 | #define APP_VERSION_NV_GPU 20660622 | 41 | #define APP_VERSION_NV_GPU 21082352 |
42 | #define APP_VERSION_NV_GPU_1 20799797 | 42 | #define APP_VERSION_NV_GPU_1 20799797 |
43 | #define APP_VERSION_GM20B_5 20490253 | 43 | #define APP_VERSION_GM20B_5 20490253 |
44 | #define APP_VERSION_GM20B_4 19008461 | 44 | #define APP_VERSION_GM20B_4 19008461 |
@@ -178,7 +178,7 @@ struct pmu_ucode_desc_v1 { | |||
178 | #define PMU_UNIT_PERF (0x13) | 178 | #define PMU_UNIT_PERF (0x13) |
179 | #define PMU_UNIT_RC (0x1F) | 179 | #define PMU_UNIT_RC (0x1F) |
180 | #define PMU_UNIT_FECS_MEM_OVERRIDE (0x1E) | 180 | #define PMU_UNIT_FECS_MEM_OVERRIDE (0x1E) |
181 | #define PMU_UNIT_CLK (0x1C) | 181 | #define PMU_UNIT_CLK (0x0D) |
182 | 182 | ||
183 | #define PMU_UNIT_END (0x23) | 183 | #define PMU_UNIT_END (0x23) |
184 | 184 | ||
@@ -255,10 +255,11 @@ struct pmu_init_msg_pmu_v2 { | |||
255 | u8 dummy[18]; | 255 | u8 dummy[18]; |
256 | }; | 256 | }; |
257 | 257 | ||
258 | #define PMU_QUEUE_COUNT_FOR_V3 3 | ||
258 | struct pmu_init_msg_pmu_v3 { | 259 | struct pmu_init_msg_pmu_v3 { |
259 | u8 msg_type; | 260 | u8 msg_type; |
260 | u8 queue_index[PMU_QUEUE_COUNT]; | 261 | u8 queue_index[PMU_QUEUE_COUNT_FOR_V3]; |
261 | u16 queue_size[PMU_QUEUE_COUNT]; | 262 | u16 queue_size[PMU_QUEUE_COUNT_FOR_V3]; |
262 | u16 queue_offset; | 263 | u16 queue_offset; |
263 | 264 | ||
264 | u16 sw_managed_area_offset; | 265 | u16 sw_managed_area_offset; |
diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.h b/drivers/gpu/nvgpu/gm206/acr_gm206.h index 86bc642a..b0ccbf9c 100644 --- a/drivers/gpu/nvgpu/gm206/acr_gm206.h +++ b/drivers/gpu/nvgpu/gm206/acr_gm206.h | |||
@@ -42,6 +42,8 @@ struct flcn_bl_dmem_desc_v1 { | |||
42 | u32 code_entry_point; | 42 | u32 code_entry_point; |
43 | struct falc_u64 data_dma_base; | 43 | struct falc_u64 data_dma_base; |
44 | u32 data_size; | 44 | u32 data_size; |
45 | u32 argc; | ||
46 | u32 argv; | ||
45 | }; | 47 | }; |
46 | 48 | ||
47 | /*! | 49 | /*! |