From d224ca20089a9f05bd72d83990c190ad0c1e73c8 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Fri, 11 Apr 2014 17:46:07 +0300 Subject: gpu: nvgpu: Get host1x device from DTS Currently the gpu driver assumes that the GPU is a child of host1x. This is an invalid assumption and therefore we need to get the host1x device from device tree based on nvidia,host1x property. Bug 1311528 Bug 1434573 Change-Id: I097e39369aaa15ab6652cd23f353f88f7c2b9c48 Signed-off-by: Arto Merilainen Reviewed-on: http://git-master/r/395664 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 8122d213..55ee5181 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c @@ -343,8 +343,8 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c) return NULL; sp->c = c; - sp->host1x_pdev = to_platform_device(c->g->dev->dev.parent); - sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid); + sp->host1x_pdev = c->g->host1x_dev; + sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, 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