summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2017-06-27 14:20:58 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-30 01:34:35 -0400
commit7d584bf868e53638f5c05b588dcd307e71cf9c82 (patch)
treeebd3eafd0f71a018f51ac34ec10f55e8669c013d /drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
parentd32bd6605d37f576e186d05e0853120cd9782fd3 (diff)
gpu: nvgpu: rename hw_chid to chid
hw_chid is a relative id for vgpu. For native it's same as hw id. Renaming it to chid to avoid confusing. Jira VFND-3796 Change-Id: I1c7924da1757330ace715a7c52ac61ec9dc7065c Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: https://git-master/r/1509530 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/fifo_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/fifo_gm20b.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index efa0c589..19782412 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -36,18 +36,18 @@ static void channel_gm20b_bind(struct channel_gk20a *c)
36 >> ram_in_base_shift_v(); 36 >> ram_in_base_shift_v();
37 37
38 gk20a_dbg_info("bind channel %d inst ptr 0x%08x", 38 gk20a_dbg_info("bind channel %d inst ptr 0x%08x",
39 c->hw_chid, inst_ptr); 39 c->chid, inst_ptr);
40 40
41 41
42 gk20a_writel(g, ccsr_channel_inst_r(c->hw_chid), 42 gk20a_writel(g, ccsr_channel_inst_r(c->chid),
43 ccsr_channel_inst_ptr_f(inst_ptr) | 43 ccsr_channel_inst_ptr_f(inst_ptr) |
44 nvgpu_aperture_mask(g, &c->inst_block, 44 nvgpu_aperture_mask(g, &c->inst_block,
45 ccsr_channel_inst_target_sys_mem_ncoh_f(), 45 ccsr_channel_inst_target_sys_mem_ncoh_f(),
46 ccsr_channel_inst_target_vid_mem_f()) | 46 ccsr_channel_inst_target_vid_mem_f()) |
47 ccsr_channel_inst_bind_true_f()); 47 ccsr_channel_inst_bind_true_f());
48 48
49 gk20a_writel(g, ccsr_channel_r(c->hw_chid), 49 gk20a_writel(g, ccsr_channel_r(c->chid),
50 (gk20a_readl(g, ccsr_channel_r(c->hw_chid)) & 50 (gk20a_readl(g, ccsr_channel_r(c->chid)) &
51 ~ccsr_channel_enable_set_f(~0)) | 51 ~ccsr_channel_enable_set_f(~0)) |
52 ccsr_channel_enable_set_true_f()); 52 ccsr_channel_enable_set_true_f());
53 wmb(); 53 wmb();