diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-05-25 08:11:38 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-08 09:37:15 -0400 |
commit | 0ad7f1d9aa18d959abf3cba6ca4e532fc9246a31 (patch) | |
tree | 781bd0ef8ffa6d11d45b9f595bfcbc966e5733e7 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | 2c9713e21c9ab93e7af45a4b9e76c1f378aab024 (diff) |
gpu: nvgpu: use nvgpu specific nvhost APIs
Remove use of linux specifix header files
<linux/nvhost.h> and <linux/nvhost_ioctl.h>
and use nvgpu specific header file <nvgpu/nvhost.h>
instead
This is needed to remove all Linux dependencies
from nvgpu driver
Replace all nvhost_*() calls by
nvgpu_nvhost_*() calls from new nvgpu library
Remove platform device pointer host1x_dev
from struct gk20a and add struct
nvgpu_nvhost_dev instead
Jira NVGPU-29
Change-Id: Ia7af70602cfc16f9ccc380752538c05a9cbb8a67
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1489726
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 7eb28f2f..4b0667c5 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -18,9 +18,6 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <trace/events/gk20a.h> | 20 | #include <trace/events/gk20a.h> |
21 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | ||
22 | #include <linux/nvhost.h> | ||
23 | #endif | ||
24 | 21 | ||
25 | #include <nvgpu/dma.h> | 22 | #include <nvgpu/dma.h> |
26 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
@@ -32,6 +29,7 @@ | |||
32 | #include <nvgpu/bug.h> | 29 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/log2.h> | 30 | #include <nvgpu/log2.h> |
34 | #include <nvgpu/debug.h> | 31 | #include <nvgpu/debug.h> |
32 | #include <nvgpu/nvhost.h> | ||
35 | 33 | ||
36 | #include "gk20a.h" | 34 | #include "gk20a.h" |
37 | #include "ctxsw_trace_gk20a.h" | 35 | #include "ctxsw_trace_gk20a.h" |
@@ -3537,7 +3535,7 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, | |||
3537 | gk20a_debug_output(o, "%s on syncpt %u (%s) val %u\n", | 3535 | gk20a_debug_output(o, "%s on syncpt %u (%s) val %u\n", |
3538 | (status == 3 || status == 8) ? "Waiting" : "Waited", | 3536 | (status == 3 || status == 8) ? "Waiting" : "Waited", |
3539 | pbdma_syncpointb_syncpt_index_v(syncpointb), | 3537 | pbdma_syncpointb_syncpt_index_v(syncpointb), |
3540 | nvhost_syncpt_get_name(g->host1x_dev, | 3538 | nvgpu_nvhost_syncpt_get_name(g->nvhost_dev, |
3541 | pbdma_syncpointb_syncpt_index_v(syncpointb)), | 3539 | pbdma_syncpointb_syncpt_index_v(syncpointb)), |
3542 | pbdma_syncpointa_payload_v(syncpointa)); | 3540 | pbdma_syncpointa_payload_v(syncpointa)); |
3543 | #endif | 3541 | #endif |