diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 19012bf5..d036a5ea 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -775,6 +775,7 @@ struct gpu_ops { | |||
775 | void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid); | 775 | void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid); |
776 | int (*mclk_init)(struct gk20a *g); | 776 | int (*mclk_init)(struct gk20a *g); |
777 | void (*mclk_deinit)(struct gk20a *g); | 777 | void (*mclk_deinit)(struct gk20a *g); |
778 | int (*mclk_change)(struct gk20a *g, u16 val); | ||
778 | u32 lspmuwprinitdone; | 779 | u32 lspmuwprinitdone; |
779 | u32 lsfloadedfalconid; | 780 | u32 lsfloadedfalconid; |
780 | bool fecsbootstrapdone; | 781 | bool fecsbootstrapdone; |
@@ -1286,12 +1287,14 @@ struct gk20a { | |||
1286 | * from monitoring power, current and voltage */ | 1287 | * from monitoring power, current and voltage */ |
1287 | bool power_sensor_missing; | 1288 | bool power_sensor_missing; |
1288 | 1289 | ||
1290 | /* memory training sequence and mclk switch scripts */ | ||
1291 | u32 mem_config_idx; | ||
1292 | |||
1289 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU) | 1293 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU) |
1290 | phys_addr_t syncpt_unit_base; | 1294 | phys_addr_t syncpt_unit_base; |
1291 | size_t syncpt_unit_size; | 1295 | size_t syncpt_unit_size; |
1292 | u32 syncpt_size; | 1296 | u32 syncpt_size; |
1293 | #endif | 1297 | #endif |
1294 | |||
1295 | }; | 1298 | }; |
1296 | 1299 | ||
1297 | static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) | 1300 | static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 72322e54..63d2c5a2 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -235,6 +235,9 @@ struct gk20a_platform { | |||
235 | u32 ina3221_dcb_index; | 235 | u32 ina3221_dcb_index; |
236 | u32 ina3221_i2c_address; | 236 | u32 ina3221_i2c_address; |
237 | u32 ina3221_i2c_port; | 237 | u32 ina3221_i2c_port; |
238 | |||
239 | /* memory training pattern and mclk switch sequences */ | ||
240 | u8 mem_config_idx; | ||
238 | }; | 241 | }; |
239 | 242 | ||
240 | static inline struct gk20a_platform *gk20a_get_platform( | 243 | static inline struct gk20a_platform *gk20a_get_platform( |