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

Commit dee8268f authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: Move driver to DRM tree 



In order to make subsystem-wide changes easier, move the Tegra DRM
driver back into the DRM tree.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fc3be3e8

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2816,6 +2816,7 @@ L: dri-devel@lists.freedesktop.org 
L:	linux-tegra@vger.kernel.org

T:	git git://anongit.freedesktop.org/tegra/linux.git

S:	Maintained

F:	drivers/gpu/drm/tegra/

F:	drivers/gpu/host1x/

F:	include/linux/host1x.h

F:	include/uapi/drm/tegra_drm.h

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -236,3 +236,5 @@ source "drivers/gpu/drm/tilcdc/Kconfig" 
source "drivers/gpu/drm/qxl/Kconfig"



source "drivers/gpu/drm/msm/Kconfig"



source "drivers/gpu/drm/tegra/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,4 +55,5 @@ obj-$(CONFIG_DRM_OMAP) += omapdrm/ 
obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/

obj-$(CONFIG_DRM_QXL) += qxl/

obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_DRM_TEGRA) += tegra/

obj-y			+= i2c/

drivers/gpu/host1x/drm/Kconfig→drivers/gpu/drm/tegra/Kconfig

+7 −5
Original line number Diff line number Diff line 
config DRM_TEGRA

	bool "NVIDIA Tegra DRM"

	depends on ARCH_TEGRA || ARCH_MULTIPLATFORM

	depends on DRM

	select TEGRA_HOST1X

	select DRM_KMS_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA
@@ -13,6 +15,11 @@ config DRM_TEGRA 


if DRM_TEGRA



config DRM_TEGRA_DEBUG

	bool "NVIDIA Tegra DRM debug support"

	help

	  Say yes here to enable debugging support.



config DRM_TEGRA_STAGING

	bool "Enable HOST1X interface"

	depends on STAGING
@@ -21,9 +28,4 @@ config DRM_TEGRA_STAGING 


	  If unsure, choose N.



config DRM_TEGRA_DEBUG

	bool "NVIDIA Tegra DRM debug support"

	help

	  Say yes here to enable debugging support.



endif

drivers/gpu/drm/tegra/Makefile

0 → 100644
+14 −0
Original line number Diff line number Diff line 
ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG



tegra-drm-y := \

	bus.o \

	drm.o \

	gem.o \

	fb.o \

	dc.o \

	output.o \

	rgb.o \

	hdmi.o \

	gr2d.o



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