Merge remote-tracking branch 'origin/display/lcdif' into display/next

* origin/display/lcdif: (79 commits)
  LF-2649 drm/imx: lcdifv3: Fix plane settings when enabling crtc
  LF-7783-2: drm: imx: lcdifv3: remove lcdif3 specific code
  LF-7728 gpu: imx: lcdifv3: Drop device reset controls for "fsl,imx8mp-lcdif1"
  LF-6416-1 gpu: imx: lcdifv3: Fix pixel data sample edge
  LF-6273-2 gpu: imx: lcdifv3: common: Control i.MX93 LCDIF QoS and cache when do runtime PM
  ...

drivers/gpu/drm/imx/Kconfig

@@ -5,7 +5,7 @@ config DRM_IMX
 	select VIDEOMODE_HELPERS
 	select DRM_GEM_DMA_HELPER
 	depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST)
-	depends on IMX_IPUV3_CORE || IMX_DPU_CORE
+	depends on IMX_IPUV3_CORE || IMX_DPU_CORE || IMX8MM_LCDIF_CORE
 	help
 	  enable i.MX graphics support
 
@@ -82,3 +82,5 @@ source "drivers/gpu/drm/imx/dpu/Kconfig"
 source "drivers/gpu/drm/imx/dcss/Kconfig"
 source "drivers/gpu/drm/imx/mhdp/Kconfig"
 source "drivers/gpu/drm/imx/ipuv3/Kconfig"
+source "drivers/gpu/drm/imx/lcdif/Kconfig"
+source "drivers/gpu/drm/imx/lcdifv3/Kconfig"

drivers/gpu/drm/imx/Makefile

@@ -18,3 +18,5 @@ obj-$(CONFIG_DRM_IMX_SEC_DSIM) += sec_mipi_dsim-imx.o
 obj-$(CONFIG_IMX8MP_HDMI_PAVI) += imx8mp-hdmi-pavi.o
 obj-$(CONFIG_DRM_IMX_DCSS) += dcss/
 obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += mhdp/
+obj-$(CONFIG_DRM_IMX8MM_LCDIF) += lcdif/
+obj-$(CONFIG_DRM_IMX_LCDIFV3) += lcdifv3/

drivers/gpu/drm/imx/lcdif/Kconfig

@@ -0,0 +1,8 @@
+config DRM_IMX8MM_LCDIF
+	tristate "i.MX8mm LCDIF controller DRM driver"
+	depends on DRM_IMX
+	depends on IMX8MM_LCDIF_CORE
+	default y if DRM_IMX=y
+	default m if DRM_IMX=m
+	help
+	  enable i.MX8mm LCDIF controller DRM driver under DRM_IMX.

drivers/gpu/drm/imx/lcdif/Makefile

@@ -0,0 +1,4 @@
+ccflags-y += -I $(srctree)/$(src)/../
+
+imx8mm-lcdif-crtc-objs := lcdif-crtc.o lcdif-plane.o lcdif-kms.o
+obj-$(CONFIG_DRM_IMX8MM_LCDIF) += imx8mm-lcdif-crtc.o