diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-03-15 09:10:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-23 11:04:23 -0400 |
commit | 33f637585ecd617a9f4423f56e2aa6df0691ac64 (patch) | |
tree | e6f67da9b18ec64cae039b6af76c6abb27a70323 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | 7505a759542c2d95e5abb42d44b8fb6afda74a87 (diff) |
gpu: nvgpu: split nvhost dependency on plat interface
Add CONFIG_TEGRA_GK20A_NVHOST and remove the TEGRA_GRHOST ||
TEGRA_HOST1X dependency in CONFIG_TEGRA_GK20A to allow using the iGPU
without the nvhost driver. Use the new config to guard syncpt-related
code.
Also make TEGRA_ACR depend on GK20A too so that it aligns properly under
gk20a in menuconfig.
Bug 1853519
Change-Id: I9e9b0a7915d000aae7930821627b7a01d08d3f5c
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1321303
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index b390daa4..58020d41 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -21,7 +21,9 @@ | |||
21 | #include <linux/scatterlist.h> | 21 | #include <linux/scatterlist.h> |
22 | #include <trace/events/gk20a.h> | 22 | #include <trace/events/gk20a.h> |
23 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
24 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | ||
24 | #include <linux/nvhost.h> | 25 | #include <linux/nvhost.h> |
26 | #endif | ||
25 | #include <linux/sort.h> | 27 | #include <linux/sort.h> |
26 | 28 | ||
27 | #include <nvgpu/timers.h> | 29 | #include <nvgpu/timers.h> |
@@ -3714,7 +3716,7 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, | |||
3714 | atomic_read(&hw_sema->next_value), | 3716 | atomic_read(&hw_sema->next_value), |
3715 | nvgpu_hw_sema_addr(hw_sema)); | 3717 | nvgpu_hw_sema_addr(hw_sema)); |
3716 | 3718 | ||
3717 | #ifdef CONFIG_TEGRA_GK20A | 3719 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
3718 | if ((pbdma_syncpointb_op_v(syncpointb) == pbdma_syncpointb_op_wait_v()) | 3720 | if ((pbdma_syncpointb_op_v(syncpointb) == pbdma_syncpointb_op_wait_v()) |
3719 | && (pbdma_syncpointb_wait_switch_v(syncpointb) == | 3721 | && (pbdma_syncpointb_wait_switch_v(syncpointb) == |
3720 | pbdma_syncpointb_wait_switch_en_v())) | 3722 | pbdma_syncpointb_wait_switch_en_v())) |