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/fence_gk20a.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index 115cd2b5..ea3cd3ff 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c @@ -27,7 +27,7 @@ #include "../drivers/staging/android/sync.h" #endif -#ifdef CONFIG_TEGRA_GK20A +#ifdef CONFIG_TEGRA_GK20A_NVHOST #include #include #endif @@ -262,7 +262,7 @@ int gk20a_fence_from_semaphore( return 0; } -#ifdef CONFIG_TEGRA_GK20A +#ifdef CONFIG_TEGRA_GK20A_NVHOST /* Fences that are backed by host1x syncpoints: */ static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, long timeout) @@ -341,8 +341,11 @@ int gk20a_fence_from_syncpt( return 0; } #else -int gk20a_fence_from_syncpt(struct platform_device *host1x_pdev, - u32 id, u32 value, bool wfi) +int gk20a_fence_from_syncpt( + struct gk20a_fence *fence_out, + struct platform_device *host1x_pdev, + u32 id, u32 value, bool wfi, + bool need_sync_fence) { return -EINVAL; } -- cgit v1.2.2