mirror of
https://github.com/torvalds/linux
synced 2024-09-23 04:49:22 +00:00
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: Thierry Reding <treding@nvidia.com>
This commit is contained in:
parent
fc3be3e8fc
commit
dee8268f8f
|
@ -2816,6 +2816,7 @@ L: dri-devel@lists.freedesktop.org
|
||||||
L: linux-tegra@vger.kernel.org
|
L: linux-tegra@vger.kernel.org
|
||||||
T: git git://anongit.freedesktop.org/tegra/linux.git
|
T: git git://anongit.freedesktop.org/tegra/linux.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
F: drivers/gpu/drm/tegra/
|
||||||
F: drivers/gpu/host1x/
|
F: drivers/gpu/host1x/
|
||||||
F: include/linux/host1x.h
|
F: include/linux/host1x.h
|
||||||
F: include/uapi/drm/tegra_drm.h
|
F: include/uapi/drm/tegra_drm.h
|
||||||
|
|
|
@ -236,3 +236,5 @@ source "drivers/gpu/drm/tilcdc/Kconfig"
|
||||||
source "drivers/gpu/drm/qxl/Kconfig"
|
source "drivers/gpu/drm/qxl/Kconfig"
|
||||||
|
|
||||||
source "drivers/gpu/drm/msm/Kconfig"
|
source "drivers/gpu/drm/msm/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/gpu/drm/tegra/Kconfig"
|
||||||
|
|
|
@ -55,4 +55,5 @@ obj-$(CONFIG_DRM_OMAP) += omapdrm/
|
||||||
obj-$(CONFIG_DRM_TILCDC) += tilcdc/
|
obj-$(CONFIG_DRM_TILCDC) += tilcdc/
|
||||||
obj-$(CONFIG_DRM_QXL) += qxl/
|
obj-$(CONFIG_DRM_QXL) += qxl/
|
||||||
obj-$(CONFIG_DRM_MSM) += msm/
|
obj-$(CONFIG_DRM_MSM) += msm/
|
||||||
|
obj-$(CONFIG_DRM_TEGRA) += tegra/
|
||||||
obj-y += i2c/
|
obj-y += i2c/
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
config DRM_TEGRA
|
config DRM_TEGRA
|
||||||
bool "NVIDIA Tegra DRM"
|
bool "NVIDIA Tegra DRM"
|
||||||
|
depends on ARCH_TEGRA || ARCH_MULTIPLATFORM
|
||||||
depends on DRM
|
depends on DRM
|
||||||
|
select TEGRA_HOST1X
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select FB_SYS_FILLRECT
|
select FB_SYS_FILLRECT
|
||||||
select FB_SYS_COPYAREA
|
select FB_SYS_COPYAREA
|
||||||
|
@ -13,6 +15,11 @@ config DRM_TEGRA
|
||||||
|
|
||||||
if 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
|
config DRM_TEGRA_STAGING
|
||||||
bool "Enable HOST1X interface"
|
bool "Enable HOST1X interface"
|
||||||
depends on STAGING
|
depends on STAGING
|
||||||
|
@ -21,9 +28,4 @@ config DRM_TEGRA_STAGING
|
||||||
|
|
||||||
If unsure, choose N.
|
If unsure, choose N.
|
||||||
|
|
||||||
config DRM_TEGRA_DEBUG
|
|
||||||
bool "NVIDIA Tegra DRM debug support"
|
|
||||||
help
|
|
||||||
Say yes here to enable debugging support.
|
|
||||||
|
|
||||||
endif
|
endif
|
14
drivers/gpu/drm/tegra/Makefile
Normal file
14
drivers/gpu/drm/tegra/Makefile
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
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
|
|
@ -19,6 +19,4 @@ config TEGRA_HOST1X_FIREWALL
|
||||||
|
|
||||||
If unsure, choose Y.
|
If unsure, choose Y.
|
||||||
|
|
||||||
source "drivers/gpu/host1x/drm/Kconfig"
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -9,12 +9,4 @@ host1x-y = \
|
||||||
debug.o \
|
debug.o \
|
||||||
hw/host1x01.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
|
|
||||||
host1x-$(CONFIG_DRM_TEGRA) += drm/output.o drm/rgb.o drm/hdmi.o
|
|
||||||
host1x-$(CONFIG_DRM_TEGRA) += drm/gem.o
|
|
||||||
host1x-$(CONFIG_DRM_TEGRA) += drm/gr2d.o
|
|
||||||
host1x-$(CONFIG_DRM_TEGRA) += drm/bus.o
|
|
||||||
obj-$(CONFIG_TEGRA_HOST1X) += host1x.o
|
obj-$(CONFIG_TEGRA_HOST1X) += host1x.o
|
||||||
|
|
|
@ -19,10 +19,10 @@ source "drivers/char/agp/Kconfig"
|
||||||
|
|
||||||
source "drivers/gpu/vga/Kconfig"
|
source "drivers/gpu/vga/Kconfig"
|
||||||
|
|
||||||
source "drivers/gpu/drm/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/gpu/host1x/Kconfig"
|
source "drivers/gpu/host1x/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/gpu/drm/Kconfig"
|
||||||
|
|
||||||
config VGASTATE
|
config VGASTATE
|
||||||
tristate
|
tristate
|
||||||
default n
|
default n
|
||||||
|
|
Loading…
Reference in a new issue