diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-08-12 20:39:31 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-08-18 18:03:56 -0400 |
commit | 5d4319ad282d7d9e3c6ef79ea481ca81d61969f2 (patch) | |
tree | 7b1e263668a61249c7b7932a7b25432e939a6769 /drivers | |
parent | 198b895a881ca067a2411b7367579cb1d594ab5a (diff) |
gpu: nvgpu: vgpu: add channel wdt support
- avoid dump gr registers for vgpu
- init wdt lock
Bug 1776876
JIRA VFND-2151
Change-Id: I73293e0d23b614129c763cb22b09156a8e1432cc
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1202256
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/debug_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c index a57a3c74..5b06d35c 100644 --- a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c | |||
@@ -264,7 +264,8 @@ static int gk20a_gr_dump_regs(struct device *dev, | |||
264 | struct gk20a_platform *platform = gk20a_get_platform(dev); | 264 | struct gk20a_platform *platform = gk20a_get_platform(dev); |
265 | struct gk20a *g = platform->g; | 265 | struct gk20a *g = platform->g; |
266 | 266 | ||
267 | gr_gk20a_elpg_protected_call(g, g->ops.gr.dump_gr_regs(g, o)); | 267 | if (g->ops.gr.dump_gr_regs) |
268 | gr_gk20a_elpg_protected_call(g, g->ops.gr.dump_gr_regs(g, o)); | ||
268 | 269 | ||
269 | return 0; | 270 | return 0; |
270 | } | 271 | } |
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index 87faa2f2..783b2f55 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -1086,4 +1086,5 @@ void vgpu_init_gr_ops(struct gpu_ops *gops) | |||
1086 | gops->gr.set_sm_debug_mode = vgpu_gr_set_sm_debug_mode; | 1086 | gops->gr.set_sm_debug_mode = vgpu_gr_set_sm_debug_mode; |
1087 | gops->gr.update_smpc_ctxsw_mode = vgpu_gr_update_smpc_ctxsw_mode; | 1087 | gops->gr.update_smpc_ctxsw_mode = vgpu_gr_update_smpc_ctxsw_mode; |
1088 | gops->gr.update_hwpm_ctxsw_mode = vgpu_gr_update_hwpm_ctxsw_mode; | 1088 | gops->gr.update_hwpm_ctxsw_mode = vgpu_gr_update_hwpm_ctxsw_mode; |
1089 | gops->gr.dump_gr_regs = NULL; | ||
1089 | } | 1090 | } |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 125be58c..c548175a 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -240,6 +240,7 @@ static int vgpu_init_support(struct platform_device *pdev) | |||
240 | 240 | ||
241 | mutex_init(&g->dbg_sessions_lock); | 241 | mutex_init(&g->dbg_sessions_lock); |
242 | mutex_init(&g->client_lock); | 242 | mutex_init(&g->client_lock); |
243 | mutex_init(&g->ch_wdt_lock); | ||
243 | 244 | ||
244 | g->remove_support = vgpu_remove_support; | 245 | g->remove_support = vgpu_remove_support; |
245 | return 0; | 246 | return 0; |