Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/display/lcdif' into display/next
Browse files Browse the repository at this point in the history
* origin/display/lcdif: (68 commits)
  LF-4887-6 drm/imx: lcdif: Add MPU interface(8080 mode) support
  MA-18519 drm/imx: lcdifv3: Enable axi clock before access register
  LF-3991-4 drm/imx: lcdifv3: plane: Fix ->atomic_{check, update, disable} build issue due to rebase
  LF-3991-3 drm/imx: lcdif: plane: Fix ->atomic_{check, update, disable} build issue due to rebase
  LF-2653 drm/imx: lcdif: implement mode_valid() for CRTC
  ...
  • Loading branch information
Dong Aisheng committed Nov 30, 2021
2 parents eabd4e7 + b1dec6d commit 82b6c17
Show file tree
Hide file tree
Showing 28 changed files with 3,695 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ config DRM_IMX
select DRM_GEM_CMA_HELPER
select DRM_KMS_CMA_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 || IMX_LCDIF_CORE
help
enable i.MX graphics support

Expand Down Expand Up @@ -68,3 +68,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"
2 changes: 2 additions & 0 deletions drivers/gpu/drm/imx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,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_IMX_LCDIF) += lcdif/
obj-$(CONFIG_DRM_IMX_LCDIFV3) += lcdifv3/
8 changes: 8 additions & 0 deletions drivers/gpu/drm/imx/lcdif/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config DRM_IMX_LCDIF
tristate "i.MX LCDIF controller DRM driver"
depends on DRM_IMX
depends on IMX_LCDIF_CORE
default y if DRM_IMX=y
default m if DRM_IMX=m
help
enable i.MX LCDIF controller DRM driver under DRM_IMX.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/imx/lcdif/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ccflags-y += -I $(srctree)/$(src)/../

imx-lcdif-crtc-objs := lcdif-crtc.o lcdif-plane.o lcdif-kms.o
obj-$(CONFIG_DRM_IMX_LCDIF) += imx-lcdif-crtc.o

0 comments on commit 82b6c17

Please sign in to comment.