diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-21 15:55:35 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 21:14:53 -0400 |
commit | c9665079d7b12f22a847c62587724b4ee120ca6e (patch) | |
tree | 7882bd08193db4c34b3b8ad7df7013339da2fba1 /drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |
parent | b69020bff5dfa69cad926c9374cdbe9a62509ffd (diff) |
gpu: nvgpu: rename mem_desc to nvgpu_mem
Renaming was done with the following command:
$ find -type f | \
xargs sed -i 's/struct mem_desc/struct nvgpu_mem/g'
Also rename mem_desc.[ch] to nvgpu_mem.[ch].
JIRA NVGPU-12
Change-Id: I69395758c22a56aa01e3dffbcded70a729bf559a
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1325547
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 88649d8e..84161304 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -185,8 +185,8 @@ struct pmu_payload { | |||
185 | }; | 185 | }; |
186 | 186 | ||
187 | struct pmu_surface { | 187 | struct pmu_surface { |
188 | struct mem_desc vidmem_desc; | 188 | struct nvgpu_mem vidmem_desc; |
189 | struct mem_desc sysmem_desc; | 189 | struct nvgpu_mem sysmem_desc; |
190 | struct flcn_mem_desc_v0 params; | 190 | struct flcn_mem_desc_v0 params; |
191 | }; | 191 | }; |
192 | 192 | ||
@@ -204,14 +204,14 @@ struct pmu_sequence { | |||
204 | struct pmu_allocation_v2 in_v2; | 204 | struct pmu_allocation_v2 in_v2; |
205 | struct pmu_allocation_v3 in_v3; | 205 | struct pmu_allocation_v3 in_v3; |
206 | }; | 206 | }; |
207 | struct mem_desc *in_mem; | 207 | struct nvgpu_mem *in_mem; |
208 | union { | 208 | union { |
209 | struct pmu_allocation_v0 out_v0; | 209 | struct pmu_allocation_v0 out_v0; |
210 | struct pmu_allocation_v1 out_v1; | 210 | struct pmu_allocation_v1 out_v1; |
211 | struct pmu_allocation_v2 out_v2; | 211 | struct pmu_allocation_v2 out_v2; |
212 | struct pmu_allocation_v3 out_v3; | 212 | struct pmu_allocation_v3 out_v3; |
213 | }; | 213 | }; |
214 | struct mem_desc *out_mem; | 214 | struct nvgpu_mem *out_mem; |
215 | u8 *out_payload; | 215 | u8 *out_payload; |
216 | pmu_callback callback; | 216 | pmu_callback callback; |
217 | void* cb_params; | 217 | void* cb_params; |
@@ -314,13 +314,13 @@ struct pmu_gk20a { | |||
314 | struct pmu_ucode_desc *desc; | 314 | struct pmu_ucode_desc *desc; |
315 | struct pmu_ucode_desc_v1 *desc_v1; | 315 | struct pmu_ucode_desc_v1 *desc_v1; |
316 | }; | 316 | }; |
317 | struct mem_desc ucode; | 317 | struct nvgpu_mem ucode; |
318 | 318 | ||
319 | struct mem_desc pg_buf; | 319 | struct nvgpu_mem pg_buf; |
320 | /* TBD: remove this if ZBC seq is fixed */ | 320 | /* TBD: remove this if ZBC seq is fixed */ |
321 | struct mem_desc seq_buf; | 321 | struct nvgpu_mem seq_buf; |
322 | struct mem_desc trace_buf; | 322 | struct nvgpu_mem trace_buf; |
323 | struct mem_desc wpr_buf; | 323 | struct nvgpu_mem wpr_buf; |
324 | bool buf_loaded; | 324 | bool buf_loaded; |
325 | 325 | ||
326 | struct pmu_sha1_gid gid_info; | 326 | struct pmu_sha1_gid gid_info; |
@@ -459,12 +459,12 @@ int gk20a_pmu_reset(struct gk20a *g); | |||
459 | int pmu_idle(struct pmu_gk20a *pmu); | 459 | int pmu_idle(struct pmu_gk20a *pmu); |
460 | int pmu_enable_hw(struct pmu_gk20a *pmu, bool enable); | 460 | int pmu_enable_hw(struct pmu_gk20a *pmu, bool enable); |
461 | 461 | ||
462 | void gk20a_pmu_surface_free(struct gk20a *g, struct mem_desc *mem); | 462 | void gk20a_pmu_surface_free(struct gk20a *g, struct nvgpu_mem *mem); |
463 | void gk20a_pmu_surface_describe(struct gk20a *g, struct mem_desc *mem, | 463 | void gk20a_pmu_surface_describe(struct gk20a *g, struct nvgpu_mem *mem, |
464 | struct flcn_mem_desc_v0 *fb); | 464 | struct flcn_mem_desc_v0 *fb); |
465 | int gk20a_pmu_vidmem_surface_alloc(struct gk20a *g, struct mem_desc *mem, | 465 | int gk20a_pmu_vidmem_surface_alloc(struct gk20a *g, struct nvgpu_mem *mem, |
466 | u32 size); | 466 | u32 size); |
467 | int gk20a_pmu_sysmem_surface_alloc(struct gk20a *g, struct mem_desc *mem, | 467 | int gk20a_pmu_sysmem_surface_alloc(struct gk20a *g, struct nvgpu_mem *mem, |
468 | u32 size); | 468 | u32 size); |
469 | 469 | ||
470 | #endif /*__PMU_GK20A_H__*/ | 470 | #endif /*__PMU_GK20A_H__*/ |