summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-02-13 17:26:54 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-04-04 21:06:38 -0400
commit50d5ed2eefd6c74bc8e5625c83763c7c92220dff (patch)
treee4329a88b3ef81de83e63daac709db0d00774f21 /drivers
parent226c671f8e99e7ed274c5c630090c6190a1367a5 (diff)
gpu: nvgpu: Reset sync point at alloc/free
Change-Id: I8753e47ef4d3f4b3645ed6c6e604449d81d3da4b Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/709061 (cherry picked from commit cc07f316334b88cc18070fba9dd9149ba193bd38) Reviewed-on: http://git-master/r/707980
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 2f514077..631813ae 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -275,6 +275,7 @@ static void gk20a_channel_syncpt_destroy(struct gk20a_channel_sync *s)
275{ 275{
276 struct gk20a_channel_syncpt *sp = 276 struct gk20a_channel_syncpt *sp =
277 container_of(s, struct gk20a_channel_syncpt, ops); 277 container_of(s, struct gk20a_channel_syncpt, ops);
278 nvhost_syncpt_set_min_eq_max_ext(sp->host1x_pdev, sp->id);
278 nvhost_free_syncpt(sp->id); 279 nvhost_free_syncpt(sp->id);
279 kfree(sp); 280 kfree(sp);
280} 281}
@@ -291,6 +292,7 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c)
291 sp->c = c; 292 sp->c = c;
292 sp->host1x_pdev = c->g->host1x_dev; 293 sp->host1x_pdev = c->g->host1x_dev;
293 sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid); 294 sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid);
295 nvhost_syncpt_set_min_eq_max_ext(sp->host1x_pdev, sp->id);
294 if (!sp->id) { 296 if (!sp->id) {
295 kfree(sp); 297 kfree(sp);
296 gk20a_err(&c->g->dev->dev, "failed to get free syncpt"); 298 gk20a_err(&c->g->dev->dev, "failed to get free syncpt");