From f3f9677c57333c0980b2e05926cb81267e814d3d Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Fri, 28 Mar 2014 16:09:05 +0530 Subject: 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 Reviewed-on: http://git-master/r/389671 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c') 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) sp->c = c; sp->host1x_pdev = to_platform_device(c->g->dev->dev.parent); - sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, c->hw_chid); + sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid); sp->ops.wait_cpu = gk20a_channel_syncpt_wait_cpu; sp->ops.is_expired = gk20a_channel_syncpt_is_expired; -- cgit v1.2.2