From 33f637585ecd617a9f4423f56e2aa6df0691ac64 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 15 Mar 2017 15:10:43 +0200 Subject: 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 Reviewed-on: http://git-master/r/1321303 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c') 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 @@ #include #include #include +#ifdef CONFIG_TEGRA_GK20A_NVHOST #include +#endif #include #include @@ -3714,7 +3716,7 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, atomic_read(&hw_sema->next_value), nvgpu_hw_sema_addr(hw_sema)); -#ifdef CONFIG_TEGRA_GK20A +#ifdef CONFIG_TEGRA_GK20A_NVHOST if ((pbdma_syncpointb_op_v(syncpointb) == pbdma_syncpointb_op_wait_v()) && (pbdma_syncpointb_wait_switch_v(syncpointb) == pbdma_syncpointb_wait_switch_en_v())) -- cgit v1.2.2