drm/tegra: Move drm to live under host1x

Make drm part of host1x driver. Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Tested-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
git-mirror · Apr 22, 2013 · 4231c6b · 4231c6b
1 parent 6236451
commit 4231c6b
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 14 deletions.
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
@@ -215,8 +215,6 @@ source "drivers/gpu/drm/cirrus/Kconfig"
 
 source "drivers/gpu/drm/shmobile/Kconfig"
 
-source "drivers/gpu/drm/tegra/Kconfig"
-
 source "drivers/gpu/drm/omapdrm/Kconfig"
 
 source "drivers/gpu/drm/tilcdc/Kconfig"

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_DRM_GMA500) += gma500/
 obj-$(CONFIG_DRM_UDL) += udl/
 obj-$(CONFIG_DRM_AST) += ast/
 obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
-obj-$(CONFIG_DRM_TEGRA) += tegra/
 obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
 obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/
 obj-$(CONFIG_DRM_QXL) += qxl/

diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile
diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig
@@ -19,4 +19,6 @@ config TEGRA_HOST1X_FIREWALL
 
 	  If unsure, choose Y.
 
+source "drivers/gpu/host1x/drm/Kconfig"
+
 endif
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
@@ -10,4 +10,9 @@ host1x-y = \
 	debug.o \
 	hw/host1x01.o
 
+ccflags-y += -Iinclude/drm
+ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG
+
+host1x-$(CONFIG_DRM_TEGRA) += drm/drm.o drm/fb.o drm/dc.o drm/host1x.o
+host1x-$(CONFIG_DRM_TEGRA) += drm/output.o drm/rgb.o drm/hdmi.o
 obj-$(CONFIG_TEGRA_HOST1X) += host1x.o
diff --git a/drivers/gpu/drm/tegra/Kconfig → drivers/gpu/host1x/drm/Kconfig b/drivers/gpu/drm/tegra/Kconfig → drivers/gpu/host1x/drm/Kconfig
@@ -1,6 +1,6 @@
 config DRM_TEGRA
 	tristate "NVIDIA Tegra DRM"
-	depends on DRM && OF && ARCH_TEGRA
+	depends on DRM && OF
 	select DRM_KMS_HELPER
 	select DRM_GEM_CMA_HELPER
 	select DRM_KMS_CMA_HELPER

diff --git a/drivers/gpu/drm/tegra/dc.c → drivers/gpu/host1x/drm/dc.c b/drivers/gpu/drm/tegra/dc.c → drivers/gpu/host1x/drm/dc.c
diff --git a/drivers/gpu/drm/tegra/dc.h → drivers/gpu/host1x/drm/dc.h b/drivers/gpu/drm/tegra/dc.h → drivers/gpu/host1x/drm/dc.h
diff --git a/drivers/gpu/drm/tegra/drm.c → drivers/gpu/host1x/drm/drm.c b/drivers/gpu/drm/tegra/drm.c → drivers/gpu/host1x/drm/drm.c
diff --git a/drivers/gpu/drm/tegra/drm.h → drivers/gpu/host1x/drm/drm.h b/drivers/gpu/drm/tegra/drm.h → drivers/gpu/host1x/drm/drm.h
@@ -7,8 +7,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef TEGRA_DRM_H
-#define TEGRA_DRM_H 1
+#ifndef HOST1X_DRM_H
+#define HOST1X_DRM_H 1
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
@@ -234,4 +234,4 @@ extern struct platform_driver tegra_hdmi_driver;
 extern struct platform_driver tegra_dc_driver;
 extern struct drm_driver tegra_drm_driver;
 
-#endif /* TEGRA_DRM_H */
+#endif /* HOST1X_DRM_H */
diff --git a/drivers/gpu/drm/tegra/fb.c → drivers/gpu/host1x/drm/fb.c b/drivers/gpu/drm/tegra/fb.c → drivers/gpu/host1x/drm/fb.c
diff --git a/drivers/gpu/drm/tegra/hdmi.c → drivers/gpu/host1x/drm/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c → drivers/gpu/host1x/drm/hdmi.c
diff --git a/drivers/gpu/drm/tegra/hdmi.h → drivers/gpu/host1x/drm/hdmi.h b/drivers/gpu/drm/tegra/hdmi.h → drivers/gpu/host1x/drm/hdmi.h
diff --git a/drivers/gpu/drm/tegra/host1x.c → drivers/gpu/host1x/drm/host1x.c b/drivers/gpu/drm/tegra/host1x.c → drivers/gpu/host1x/drm/host1x.c
diff --git a/drivers/gpu/drm/tegra/output.c → drivers/gpu/host1x/drm/output.c b/drivers/gpu/drm/tegra/output.c → drivers/gpu/host1x/drm/output.c
diff --git a/drivers/gpu/drm/tegra/rgb.c → drivers/gpu/host1x/drm/rgb.c b/drivers/gpu/drm/tegra/rgb.c → drivers/gpu/host1x/drm/rgb.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,6 @@ config TEGRA_HOST1X_FIREWALL

		If unsure, choose Y.

		source "drivers/gpu/host1x/drm/Kconfig"

		endif