summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2014-03-28 06:39:05 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:08:56 -0400
commitf3f9677c57333c0980b2e05926cb81267e814d3d (patch)
treeeee6381b7ff867e84459a092365977fbd6624c0f /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
parent0d908e51c806f83daa7a0d6e3bc3dcc6ef28ecd5 (diff)
gpu: nvgpu: gk20a: fix syncpt names for gk20a
nvhost_get_syncpt_host_managed() creates syncpt name based on platform_device pointer passed to it Passing host1x's pointer to this API results in setting gk20a syncpt names as "host1x_0" which is conflicting Hence to restore this pass gk20a's device pointer which gives syncpt names as "gk20a.0_0" Bug 1305024 Change-Id: I40325f2e4e2d9ea8de1d44e136edcb48a431e45c Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/389671 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 9f9c3ba7..291036db 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -329,7 +329,7 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c)
329 329
330 sp->c = c; 330 sp->c = c;
331 sp->host1x_pdev = to_platform_device(c->g->dev->dev.parent); 331 sp->host1x_pdev = to_platform_device(c->g->dev->dev.parent);
332 sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, c->hw_chid); 332 sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid);
333 333
334 sp->ops.wait_cpu = gk20a_channel_syncpt_wait_cpu; 334 sp->ops.wait_cpu = gk20a_channel_syncpt_wait_cpu;
335 sp->ops.is_expired = gk20a_channel_syncpt_is_expired; 335 sp->ops.is_expired = gk20a_channel_syncpt_is_expired;