summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
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/gk20a/gk20a.h
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/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index ce84a93e..06db2b7f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -426,10 +426,10 @@ struct gpu_ops {
426 unsigned long acquire_timeout, 426 unsigned long acquire_timeout,
427 u32 flags); 427 u32 flags);
428 int (*resetup_ramfc)(struct channel_gk20a *c); 428 int (*resetup_ramfc)(struct channel_gk20a *c);
429 int (*preempt_channel)(struct gk20a *g, u32 hw_chid); 429 int (*preempt_channel)(struct gk20a *g, u32 chid);
430 int (*preempt_tsg)(struct gk20a *g, u32 tsgid); 430 int (*preempt_tsg)(struct gk20a *g, u32 tsgid);
431 int (*update_runlist)(struct gk20a *g, u32 runlist_id, 431 int (*update_runlist)(struct gk20a *g, u32 runlist_id,
432 u32 hw_chid, bool add, 432 u32 chid, bool add,
433 bool wait_for_finish); 433 bool wait_for_finish);
434 void (*trigger_mmu_fault)(struct gk20a *g, 434 void (*trigger_mmu_fault)(struct gk20a *g,
435 unsigned long engine_ids); 435 unsigned long engine_ids);
@@ -477,7 +477,7 @@ struct gpu_ops {
477 void (*dump_eng_status)(struct gk20a *g, 477 void (*dump_eng_status)(struct gk20a *g,
478 struct gk20a_debug_output *o); 478 struct gk20a_debug_output *o);
479 void (*dump_channel_status_ramfc)(struct gk20a *g, 479 void (*dump_channel_status_ramfc)(struct gk20a *g,
480 struct gk20a_debug_output *o, u32 hw_chid, 480 struct gk20a_debug_output *o, u32 chid,
481 struct ch_state *ch_state); 481 struct ch_state *ch_state);
482 u32 (*intr_0_error_mask)(struct gk20a *g); 482 u32 (*intr_0_error_mask)(struct gk20a *g);
483 int (*is_preempt_pending)(struct gk20a *g, u32 id, 483 int (*is_preempt_pending)(struct gk20a *g, u32 id,