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

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
...@@ -215,8 +215,6 @@ source "drivers/gpu/drm/cirrus/Kconfig" ...@@ -215,8 +215,6 @@ source "drivers/gpu/drm/cirrus/Kconfig"
source "drivers/gpu/drm/shmobile/Kconfig" source "drivers/gpu/drm/shmobile/Kconfig"
source "drivers/gpu/drm/tegra/Kconfig"
source "drivers/gpu/drm/omapdrm/Kconfig" source "drivers/gpu/drm/omapdrm/Kconfig"
source "drivers/gpu/drm/tilcdc/Kconfig" source "drivers/gpu/drm/tilcdc/Kconfig"
......
...@@ -49,7 +49,6 @@ obj-$(CONFIG_DRM_GMA500) += gma500/ ...@@ -49,7 +49,6 @@ obj-$(CONFIG_DRM_GMA500) += gma500/
obj-$(CONFIG_DRM_UDL) += udl/ obj-$(CONFIG_DRM_UDL) += udl/
obj-$(CONFIG_DRM_AST) += ast/ obj-$(CONFIG_DRM_AST) += ast/
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/ obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
obj-$(CONFIG_DRM_TEGRA) += tegra/
obj-$(CONFIG_DRM_OMAP) += omapdrm/ 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/
......
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
...@@ -19,4 +19,6 @@ config TEGRA_HOST1X_FIREWALL ...@@ -19,4 +19,6 @@ config TEGRA_HOST1X_FIREWALL
If unsure, choose Y. If unsure, choose Y.
source "drivers/gpu/host1x/drm/Kconfig"
endif endif
...@@ -10,4 +10,9 @@ host1x-y = \ ...@@ -10,4 +10,9 @@ 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 drm/host1x.o
host1x-$(CONFIG_DRM_TEGRA) += drm/output.o drm/rgb.o drm/hdmi.o
obj-$(CONFIG_TEGRA_HOST1X) += host1x.o obj-$(CONFIG_TEGRA_HOST1X) += host1x.o
config DRM_TEGRA config DRM_TEGRA
tristate "NVIDIA Tegra DRM" tristate "NVIDIA Tegra DRM"
depends on DRM && OF && ARCH_TEGRA depends on DRM && OF
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_GEM_CMA_HELPER select DRM_GEM_CMA_HELPER
select DRM_KMS_CMA_HELPER select DRM_KMS_CMA_HELPER
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef TEGRA_DRM_H #ifndef HOST1X_DRM_H
#define TEGRA_DRM_H 1 #define HOST1X_DRM_H 1
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
...@@ -234,4 +234,4 @@ extern struct platform_driver tegra_hdmi_driver; ...@@ -234,4 +234,4 @@ extern struct platform_driver tegra_hdmi_driver;
extern struct platform_driver tegra_dc_driver; extern struct platform_driver tegra_dc_driver;
extern struct drm_driver tegra_drm_driver; extern struct drm_driver tegra_drm_driver;
#endif /* TEGRA_DRM_H */ #endif /* HOST1X_DRM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment