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/platform_gk20a.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/platform_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 99ea1bb7..d685639b 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h @@ -35,9 +35,6 @@ struct secure_page_buffer { }; struct gk20a_platform { -#ifdef CONFIG_TEGRA_GK20A - u32 syncpt_base; -#endif /* Populated by the gk20a driver before probing the platform. */ struct gk20a *g; @@ -277,8 +274,12 @@ extern struct gk20a_platform vgpu_tegra_platform; static inline bool gk20a_platform_has_syncpoints(struct device *dev) { +#ifdef CONFIG_TEGRA_GK20A_NVHOST struct gk20a_platform *p = dev_get_drvdata(dev); return p->has_syncpoints && !p->disable_syncpoints; +#else + return false; +#endif } int gk20a_tegra_busy(struct device *dev); -- cgit v1.2.2