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/debug_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/debug_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/debug_gk20a.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c index 3f1f4f0a..f5e0b73d 100644 --- a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c | |||
@@ -147,8 +147,7 @@ static void gk20a_debug_show_channel(struct gk20a *g, | |||
147 | gk20a_debug_output(o, "%s on syncpt %u (%s) val %u\n", | 147 | gk20a_debug_output(o, "%s on syncpt %u (%s) val %u\n", |
148 | (status == 3 || status == 8) ? "Waiting" : "Waited", | 148 | (status == 3 || status == 8) ? "Waiting" : "Waited", |
149 | pbdma_syncpointb_syncpt_index_v(syncpointb), | 149 | pbdma_syncpointb_syncpt_index_v(syncpointb), |
150 | nvhost_syncpt_get_name( | 150 | nvhost_syncpt_get_name(g->host1x_dev, |
151 | to_platform_device(g->dev->dev.parent), | ||
152 | pbdma_syncpointb_syncpt_index_v(syncpointb)), | 151 | pbdma_syncpointb_syncpt_index_v(syncpointb)), |
153 | pbdma_syncpointa_payload_v(syncpointa)); | 152 | pbdma_syncpointa_payload_v(syncpointa)); |
154 | 153 | ||