diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2016-06-28 13:34:15 -0400 |
---|---|---|
committer | Peter Daifuku <pdaifuku@nvidia.com> | 2016-07-30 14:29:20 -0400 |
commit | 38a59acc776c8ad5b7b5506d13a60712af7d5318 (patch) | |
tree | 4eeb2d238327e7c84e3915e1c50ae938c2e02b65 /drivers/gpu/nvgpu/vgpu | |
parent | 92415fd36694c6c8dcfbcf1de2e7197d4f883451 (diff) |
gpu: nvgpu: move dbg_session_ops to gops
Move dbg_session_ops to gops for better code consistency
JIRA VFND-1905
Change-Id: I04a11d77dd8c26d9922e80e556822f80dd2bc36d
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: http://git-master/r/1192641
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c index 38f072de..4e4379f7 100644 --- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | |||
@@ -102,8 +102,8 @@ static int vgpu_dbg_set_powergate(struct dbg_session_gk20a *dbg_s, __u32 mode) | |||
102 | return err; | 102 | return err; |
103 | } | 103 | } |
104 | 104 | ||
105 | void vgpu_dbg_init(void) | 105 | void vgpu_init_dbg_session_ops(struct gpu_ops *gops) |
106 | { | 106 | { |
107 | dbg_gpu_session_ops_gk20a.exec_reg_ops = vgpu_exec_regops; | 107 | gops->dbg_session_ops.exec_reg_ops = vgpu_exec_regops; |
108 | dbg_gpu_session_ops_gk20a.dbg_set_powergate = vgpu_dbg_set_powergate; | 108 | gops->dbg_session_ops.dbg_set_powergate = vgpu_dbg_set_powergate; |
109 | } | 109 | } |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index a00d52de..c03086e1 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -348,6 +348,7 @@ void vgpu_init_hal_common(struct gk20a *g) | |||
348 | vgpu_init_ltc_ops(gops); | 348 | vgpu_init_ltc_ops(gops); |
349 | vgpu_init_mm_ops(gops); | 349 | vgpu_init_mm_ops(gops); |
350 | vgpu_init_debug_ops(gops); | 350 | vgpu_init_debug_ops(gops); |
351 | vgpu_init_dbg_session_ops(gops); | ||
351 | vgpu_init_fecs_trace_ops(gops); | 352 | vgpu_init_fecs_trace_ops(gops); |
352 | vgpu_init_tsg_ops(gops); | 353 | vgpu_init_tsg_ops(gops); |
353 | gops->chip_init_gpu_characteristics = vgpu_init_gpu_characteristics; | 354 | gops->chip_init_gpu_characteristics = vgpu_init_gpu_characteristics; |
@@ -531,7 +532,6 @@ int vgpu_probe(struct platform_device *pdev) | |||
531 | return err; | 532 | return err; |
532 | 533 | ||
533 | vgpu_init_support(pdev); | 534 | vgpu_init_support(pdev); |
534 | vgpu_dbg_init(); | ||
535 | 535 | ||
536 | init_rwsem(&gk20a->busy_lock); | 536 | init_rwsem(&gk20a->busy_lock); |
537 | 537 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h index fdd0a54c..f79c8aab 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/vgpu/vgpu.h | |||
@@ -60,7 +60,7 @@ void vgpu_init_hal_common(struct gk20a *g); | |||
60 | int vgpu_gk20a_init_hal(struct gk20a *g); | 60 | int vgpu_gk20a_init_hal(struct gk20a *g); |
61 | int vgpu_gm20b_init_hal(struct gk20a *g); | 61 | int vgpu_gm20b_init_hal(struct gk20a *g); |
62 | 62 | ||
63 | void vgpu_dbg_init(void); | 63 | void vgpu_init_dbg_session_ops(struct gpu_ops *gops); |
64 | #else | 64 | #else |
65 | static inline int vgpu_pm_prepare_poweroff(struct device *dev) | 65 | static inline int vgpu_pm_prepare_poweroff(struct device *dev) |
66 | { | 66 | { |