summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2017-03-15 09:10:43 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-23 11:04:23 -0400
commit33f637585ecd617a9f4423f56e2aa6df0691ac64 (patch)
treee6f67da9b18ec64cae039b6af76c6abb27a70323 /drivers/gpu/nvgpu/gk20a/platform_gk20a.h
parent7505a759542c2d95e5abb42d44b8fb6afda74a87 (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/platform_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/platform_gk20a.h7
1 files changed, 4 insertions, 3 deletions
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 {
35}; 35};
36 36
37struct gk20a_platform { 37struct gk20a_platform {
38#ifdef CONFIG_TEGRA_GK20A
39 u32 syncpt_base;
40#endif
41 /* Populated by the gk20a driver before probing the platform. */ 38 /* Populated by the gk20a driver before probing the platform. */
42 struct gk20a *g; 39 struct gk20a *g;
43 40
@@ -277,8 +274,12 @@ extern struct gk20a_platform vgpu_tegra_platform;
277 274
278static inline bool gk20a_platform_has_syncpoints(struct device *dev) 275static inline bool gk20a_platform_has_syncpoints(struct device *dev)
279{ 276{
277#ifdef CONFIG_TEGRA_GK20A_NVHOST
280 struct gk20a_platform *p = dev_get_drvdata(dev); 278 struct gk20a_platform *p = dev_get_drvdata(dev);
281 return p->has_syncpoints && !p->disable_syncpoints; 279 return p->has_syncpoints && !p->disable_syncpoints;
280#else
281 return false;
282#endif
282} 283}
283 284
284int gk20a_tegra_busy(struct device *dev); 285int gk20a_tegra_busy(struct device *dev);