diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-22 13:01:14 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 21:15:15 -0400 |
commit | c876bec8bab5a1e4d6dea529700ef19c5eac5e64 (patch) | |
tree | 63619f86ef614b247965ab78b39553fcf32e39c7 /drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |
parent | 633d331ae2db50fbcce829fe324c19fc44b82c24 (diff) |
gpu: nvgpu: rename mem_desc to nvgpu_mem
$ find -type f | \
xargs sed -i 's/struct mem_desc/struct nvgpu_mem/g'
JIRA NVGPU-12
Change-Id: I2b5d015e45185269bfae7c6d4199fe843ff26834
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1326194
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index ddaaa350..6e6b5630 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -642,7 +642,7 @@ static int gr_gv11b_init_ctx_state(struct gk20a *g) | |||
642 | } | 642 | } |
643 | 643 | ||
644 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, | 644 | int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, |
645 | struct mem_desc *mem) | 645 | struct nvgpu_mem *mem) |
646 | { | 646 | { |
647 | int err; | 647 | int err; |
648 | 648 | ||
@@ -778,7 +778,7 @@ fail_free_gk20a_ctx: | |||
778 | static void dump_ctx_switch_stats(struct gk20a *g, struct vm_gk20a *vm, | 778 | static void dump_ctx_switch_stats(struct gk20a *g, struct vm_gk20a *vm, |
779 | struct gr_ctx_desc *gr_ctx) | 779 | struct gr_ctx_desc *gr_ctx) |
780 | { | 780 | { |
781 | struct mem_desc *mem = &gr_ctx->mem; | 781 | struct nvgpu_mem *mem = &gr_ctx->mem; |
782 | 782 | ||
783 | if (nvgpu_mem_begin(g, mem)) { | 783 | if (nvgpu_mem_begin(g, mem)) { |
784 | WARN_ON("Cannot map context"); | 784 | WARN_ON("Cannot map context"); |
@@ -834,7 +834,7 @@ static void gr_gv11b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm, | |||
834 | 834 | ||
835 | static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g, | 835 | static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g, |
836 | struct channel_ctx_gk20a *ch_ctx, | 836 | struct channel_ctx_gk20a *ch_ctx, |
837 | struct mem_desc *mem) | 837 | struct nvgpu_mem *mem) |
838 | { | 838 | { |
839 | struct gr_ctx_desc *gr_ctx = ch_ctx->gr_ctx; | 839 | struct gr_ctx_desc *gr_ctx = ch_ctx->gr_ctx; |
840 | u32 gfxp_preempt_option = | 840 | u32 gfxp_preempt_option = |
@@ -1925,7 +1925,7 @@ static int gr_gv11b_commit_global_timeslice(struct gk20a *g, | |||
1925 | } | 1925 | } |
1926 | 1926 | ||
1927 | static void gv11b_restore_context_header(struct gk20a *g, | 1927 | static void gv11b_restore_context_header(struct gk20a *g, |
1928 | struct mem_desc *ctxheader) | 1928 | struct nvgpu_mem *ctxheader) |
1929 | { | 1929 | { |
1930 | u32 va_lo, va_hi; | 1930 | u32 va_lo, va_hi; |
1931 | struct gr_gk20a *gr = &g->gr; | 1931 | struct gr_gk20a *gr = &g->gr; |
@@ -1947,7 +1947,7 @@ static void gv11b_restore_context_header(struct gk20a *g, | |||
1947 | ctxsw_prog_main_image_num_save_ops_o(), 0); | 1947 | ctxsw_prog_main_image_num_save_ops_o(), 0); |
1948 | } | 1948 | } |
1949 | static void gr_gv11b_write_zcull_ptr(struct gk20a *g, | 1949 | static void gr_gv11b_write_zcull_ptr(struct gk20a *g, |
1950 | struct mem_desc *mem, u64 gpu_va) | 1950 | struct nvgpu_mem *mem, u64 gpu_va) |
1951 | { | 1951 | { |
1952 | u32 va_lo, va_hi; | 1952 | u32 va_lo, va_hi; |
1953 | 1953 | ||
@@ -1962,7 +1962,7 @@ static void gr_gv11b_write_zcull_ptr(struct gk20a *g, | |||
1962 | 1962 | ||
1963 | 1963 | ||
1964 | static void gr_gv11b_write_pm_ptr(struct gk20a *g, | 1964 | static void gr_gv11b_write_pm_ptr(struct gk20a *g, |
1965 | struct mem_desc *mem, u64 gpu_va) | 1965 | struct nvgpu_mem *mem, u64 gpu_va) |
1966 | { | 1966 | { |
1967 | u32 va_lo, va_hi; | 1967 | u32 va_lo, va_hi; |
1968 | 1968 | ||