diff options
author | Arto Merilainen <amerilainen@nvidia.com> | 2014-04-11 10:46:07 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:46 -0400 |
commit | d224ca20089a9f05bd72d83990c190ad0c1e73c8 (patch) | |
tree | a33fce050a9c0d0bfd9c6d43af40b82b668d58a0 /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |
parent | 596aa6e592eef797770575833811303d5a5a65dd (diff) |
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 <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/395664
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
343 | return NULL; | 343 | return NULL; |
344 | 344 | ||
345 | sp->c = c; | 345 | sp->c = c; |
346 | sp->host1x_pdev = to_platform_device(c->g->dev->dev.parent); | 346 | sp->host1x_pdev = c->g->host1x_dev; |
347 | sp->id = nvhost_get_syncpt_host_managed(c->g->dev, c->hw_chid); | 347 | sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, c->hw_chid); |
348 | 348 | ||
349 | sp->ops.wait_cpu = gk20a_channel_syncpt_wait_cpu; | 349 | sp->ops.wait_cpu = gk20a_channel_syncpt_wait_cpu; |
350 | sp->ops.is_expired = gk20a_channel_syncpt_is_expired; | 350 | sp->ops.is_expired = gk20a_channel_syncpt_is_expired; |