소스 검색

drm: imx: Move imx-drm driver out of staging

The imx-drm driver was put into staging mostly for the following reasons,
all of which have been addressed or superseded:
 - convert the irq driver to use linear irq domains
 - work out the device tree bindings, this lead to the common of_graph
   bindings being used
 - factor out common helper functions, this mostly resulted in the
   component framework and drm of_graph helpers.

Before adding new fixes, and certainly before adding new features,
move it into its proper place below drivers/gpu/drm.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Philipp Zabel 10 년 전
부모
커밋
6556f7f82b

+ 0 - 0
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt → Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt


+ 0 - 0
Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt → Documentation/devicetree/bindings/drm/imx/hdmi.txt


+ 0 - 0
Documentation/devicetree/bindings/staging/imx-drm/ldb.txt → Documentation/devicetree/bindings/drm/imx/ldb.txt


+ 2 - 0
drivers/gpu/drm/Kconfig

@@ -202,3 +202,5 @@ source "drivers/gpu/drm/panel/Kconfig"
 source "drivers/gpu/drm/sti/Kconfig"
 
 source "drivers/gpu/drm/amd/amdkfd/Kconfig"
+
+source "drivers/gpu/drm/imx/Kconfig"

+ 1 - 0
drivers/gpu/drm/Makefile

@@ -62,6 +62,7 @@ obj-$(CONFIG_DRM_BOCHS) += bochs/
 obj-$(CONFIG_DRM_MSM) += msm/
 obj-$(CONFIG_DRM_TEGRA) += tegra/
 obj-$(CONFIG_DRM_STI) += sti/
+obj-$(CONFIG_DRM_IMX) += imx/
 obj-y			+= i2c/
 obj-y			+= panel/
 obj-y			+= bridge/

+ 0 - 0
drivers/staging/imx-drm/Kconfig → drivers/gpu/drm/imx/Kconfig


+ 0 - 0
drivers/staging/imx-drm/Makefile → drivers/gpu/drm/imx/Makefile


+ 0 - 0
drivers/staging/imx-drm/imx-drm-core.c → drivers/gpu/drm/imx/imx-drm-core.c


+ 0 - 0
drivers/staging/imx-drm/imx-drm.h → drivers/gpu/drm/imx/imx-drm.h


+ 0 - 0
drivers/staging/imx-drm/imx-hdmi.c → drivers/gpu/drm/imx/imx-hdmi.c


+ 0 - 0
drivers/staging/imx-drm/imx-hdmi.h → drivers/gpu/drm/imx/imx-hdmi.h


+ 0 - 0
drivers/staging/imx-drm/imx-ldb.c → drivers/gpu/drm/imx/imx-ldb.c


+ 0 - 0
drivers/staging/imx-drm/imx-tve.c → drivers/gpu/drm/imx/imx-tve.c


+ 0 - 0
drivers/staging/imx-drm/ipuv3-crtc.c → drivers/gpu/drm/imx/ipuv3-crtc.c


+ 0 - 0
drivers/staging/imx-drm/ipuv3-plane.c → drivers/gpu/drm/imx/ipuv3-plane.c


+ 0 - 0
drivers/staging/imx-drm/ipuv3-plane.h → drivers/gpu/drm/imx/ipuv3-plane.h


+ 0 - 0
drivers/staging/imx-drm/parallel-display.c → drivers/gpu/drm/imx/parallel-display.c


+ 0 - 2
drivers/staging/Kconfig

@@ -86,8 +86,6 @@ source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/gdm724x/Kconfig"
 
-source "drivers/staging/imx-drm/Kconfig"
-
 source "drivers/staging/fwserial/Kconfig"
 
 source "drivers/staging/goldfish/Kconfig"

+ 0 - 1
drivers/staging/Makefile

@@ -36,7 +36,6 @@ obj-$(CONFIG_STAGING_BOARD)	+= board/
 obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/
 obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/
 obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/
-obj-$(CONFIG_DRM_IMX)		+= imx-drm/
 obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/
 obj-$(CONFIG_GOLDFISH)		+= goldfish/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/

+ 0 - 17
drivers/staging/imx-drm/TODO

@@ -1,17 +0,0 @@
-TODO:
-- get DRM Maintainer review for this code
-- decide where to put the base driver. It is not specific to a subsystem
-  and would be used by DRM/KMS and media/V4L2
-
-Missing features (not necessarily for moving out of staging):
-
-- Add support for IC (Image converter)
-- Add support for CSI (CMOS Sensor interface)
-- Add support for VDIC (Video Deinterlacer)
-
-Many work-in-progress patches for the above features exist. Contact
-Sascha Hauer <kernel@pengutronix.de> if you are interested in working
-on a specific feature.
-
-Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org> and
-Sascha Hauer <kernel@pengutronix.de>