From 4231c6b01af9f0f3eeca4b8d0d87125d78233b41 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 22 Mar 2013 16:34:05 +0200 Subject: [PATCH] drm/tegra: Move drm to live under host1x Make drm part of host1x driver. Signed-off-by: Arto Merilainen Signed-off-by: Terje Bergstrom Reviewed-by: Thierry Reding Tested-by: Thierry Reding Tested-by: Erik Faye-Lund Signed-off-by: Thierry Reding --- drivers/gpu/drm/Kconfig | 2 -- drivers/gpu/drm/Makefile | 1 - drivers/gpu/drm/tegra/Makefile | 7 ------- drivers/gpu/host1x/Kconfig | 2 ++ drivers/gpu/host1x/Makefile | 5 +++++ drivers/gpu/{drm/tegra => host1x/drm}/Kconfig | 2 +- drivers/gpu/{drm/tegra => host1x/drm}/dc.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/dc.h | 0 drivers/gpu/{drm/tegra => host1x/drm}/drm.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/drm.h | 6 +++--- drivers/gpu/{drm/tegra => host1x/drm}/fb.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h | 0 drivers/gpu/{drm/tegra => host1x/drm}/host1x.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/output.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/rgb.c | 0 16 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 drivers/gpu/drm/tegra/Makefile rename drivers/gpu/{drm/tegra => host1x/drm}/Kconfig (93%) rename drivers/gpu/{drm/tegra => host1x/drm}/dc.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/dc.h (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/drm.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/drm.h (98%) rename drivers/gpu/{drm/tegra => host1x/drm}/fb.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/host1x.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/output.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/rgb.c (100%) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 19b8e0d5d910..b16c50ee769c 100644 --- 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 index 6a4211521011..1c9f24396002 100644 --- 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 deleted file mode 100644 index 80f73d1315d0..000000000000 --- a/drivers/gpu/drm/tegra/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/drivers/gpu/host1x/Kconfig b/drivers/gpu/host1x/Kconfig index 7d6bed222542..ccfd42b23606 100644 --- 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 index 49fd5807b0e7..4761e8af7bdc 100644 --- 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 b/drivers/gpu/host1x/drm/Kconfig similarity index 93% rename from drivers/gpu/drm/tegra/Kconfig rename to drivers/gpu/host1x/drm/Kconfig index be1daf7344d3..8267691b7aa3 100644 --- a/drivers/gpu/drm/tegra/Kconfig +++ b/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 b/drivers/gpu/host1x/drm/dc.c similarity index 100% rename from drivers/gpu/drm/tegra/dc.c rename to drivers/gpu/host1x/drm/dc.c diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/host1x/drm/dc.h similarity index 100% rename from drivers/gpu/drm/tegra/dc.h rename to drivers/gpu/host1x/drm/dc.h diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/host1x/drm/drm.c similarity index 100% rename from drivers/gpu/drm/tegra/drm.c rename to drivers/gpu/host1x/drm/drm.c diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/host1x/drm/drm.h similarity index 98% rename from drivers/gpu/drm/tegra/drm.h rename to drivers/gpu/host1x/drm/drm.h index 6dd75a2600eb..a6c011da2ce9 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/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 #include @@ -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 b/drivers/gpu/host1x/drm/fb.c similarity index 100% rename from drivers/gpu/drm/tegra/fb.c rename to drivers/gpu/host1x/drm/fb.c diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/host1x/drm/hdmi.c similarity index 100% rename from drivers/gpu/drm/tegra/hdmi.c rename to drivers/gpu/host1x/drm/hdmi.c diff --git a/drivers/gpu/drm/tegra/hdmi.h b/drivers/gpu/host1x/drm/hdmi.h similarity index 100% rename from drivers/gpu/drm/tegra/hdmi.h rename to drivers/gpu/host1x/drm/hdmi.h diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/host1x/drm/host1x.c similarity index 100% rename from drivers/gpu/drm/tegra/host1x.c rename to drivers/gpu/host1x/drm/host1x.c diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/host1x/drm/output.c similarity index 100% rename from drivers/gpu/drm/tegra/output.c rename to drivers/gpu/host1x/drm/output.c diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/host1x/drm/rgb.c similarity index 100% rename from drivers/gpu/drm/tegra/rgb.c rename to drivers/gpu/host1x/drm/rgb.c -- 2.34.1