diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index e4513457..c1583eab 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -136,7 +136,7 @@ struct pmu_queue { | |||
136 | u32 mutex_id; | 136 | u32 mutex_id; |
137 | u32 mutex_lock; | 137 | u32 mutex_lock; |
138 | /* used by sw, for LPQ/HPQ queue */ | 138 | /* used by sw, for LPQ/HPQ queue */ |
139 | struct mutex mutex; | 139 | struct nvgpu_mutex mutex; |
140 | 140 | ||
141 | /* current write position */ | 141 | /* current write position */ |
142 | u32 position; | 142 | u32 position; |
@@ -334,8 +334,8 @@ struct pmu_gk20a { | |||
334 | struct pmu_mutex *mutex; | 334 | struct pmu_mutex *mutex; |
335 | u32 mutex_cnt; | 335 | u32 mutex_cnt; |
336 | 336 | ||
337 | struct mutex pmu_copy_lock; | 337 | struct nvgpu_mutex pmu_copy_lock; |
338 | struct mutex pmu_seq_lock; | 338 | struct nvgpu_mutex pmu_seq_lock; |
339 | 339 | ||
340 | struct nvgpu_allocator dmem; | 340 | struct nvgpu_allocator dmem; |
341 | 341 | ||
@@ -355,8 +355,8 @@ struct pmu_gk20a { | |||
355 | 355 | ||
356 | #define PMU_ELPG_ENABLE_ALLOW_DELAY_MSEC 1 /* msec */ | 356 | #define PMU_ELPG_ENABLE_ALLOW_DELAY_MSEC 1 /* msec */ |
357 | struct work_struct pg_init; | 357 | struct work_struct pg_init; |
358 | struct mutex pg_mutex; /* protect pg-RPPG/MSCG enable/disable */ | 358 | struct nvgpu_mutex pg_mutex; /* protect pg-RPPG/MSCG enable/disable */ |
359 | struct mutex elpg_mutex; /* protect elpg enable/disable */ | 359 | struct nvgpu_mutex elpg_mutex; /* protect elpg enable/disable */ |
360 | int elpg_refcnt; /* disable -1, enable +1, <=0 elpg disabled, > 0 elpg enabled */ | 360 | int elpg_refcnt; /* disable -1, enable +1, <=0 elpg disabled, > 0 elpg enabled */ |
361 | 361 | ||
362 | union { | 362 | union { |
@@ -375,7 +375,7 @@ struct pmu_gk20a { | |||
375 | u32 load_shadow; | 375 | u32 load_shadow; |
376 | u32 load_avg; | 376 | u32 load_avg; |
377 | 377 | ||
378 | struct mutex isr_mutex; | 378 | struct nvgpu_mutex isr_mutex; |
379 | bool isr_enabled; | 379 | bool isr_enabled; |
380 | 380 | ||
381 | bool zbc_ready; | 381 | bool zbc_ready; |