Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4231c6b0 authored by Terje Bergstrom's avatar Terje Bergstrom Committed by Thierry Reding
Browse files

drm/tegra: Move drm to live under host1x 



Make drm part of host1x driver.

Signed-off-by: default avatarArto Merilainen <amerilainen@nvidia.com>
Signed-off-by: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Tested-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Tested-by: default avatarErik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
parent 6236451d

drivers/gpu/drm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/gpu/drm/tegra/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm

ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG



tegra-drm-y := drm.o fb.o dc.o host1x.o

tegra-drm-y += output.o rgb.o hdmi.o



obj-$(CONFIG_DRM_TEGRA) += tegra-drm.o

drivers/gpu/host1x/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ config TEGRA_HOST1X_FIREWALL 


	  If unsure, choose Y.



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



endif

drivers/gpu/host1x/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -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