diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2022-09-05 16:58:56 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-09-05 18:01:14 +0200 |
| commit | 537d20648c28ca72a5d2dd0f9872a6f5579856ea (patch) | |
| tree | 3bbd0dab93b2632c10750cafc0cf23fe62cdb96c | |
| parent | 1f0ed52a4a2eeb90baf25cf89747de4144b573aa (diff) | |
toradex_defconfig: verdin-imx8mp: fix concurrent use of dsi and native hdmi
With native HDMI being a kernel built in and the DSI adapters being
a module, concurrent use of the two leads to a not booting kernel.
When DRM tries to bring up native HDMI it also tries to bring up the
bridge to DSI which then returns EAGAIN as the DSI to HDMI/LVDS kernel
modules cannot be loaded yet.
This results in a never ending loop rather than continuing to init and
trying again.
Compiling the bridge to DSI as a module fixes the issue.
Upstream-status: Inappropriate [defconfig change]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | arch/arm64/configs/toradex_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/toradex_imx_v8.config | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm64/configs/toradex_defconfig b/arch/arm64/configs/toradex_defconfig index 854d1f8c3496..1a09fce6f5f7 100644 --- a/arch/arm64/configs/toradex_defconfig +++ b/arch/arm64/configs/toradex_defconfig @@ -611,7 +611,7 @@ CONFIG_DRM_IMX8QM_LDB=y CONFIG_DRM_IMX8QXP_LDB=y CONFIG_DRM_IMX8MP_LDB=y CONFIG_DRM_IMX_HDMI=y -CONFIG_DRM_IMX_SEC_DSIM=y +CONFIG_DRM_IMX_SEC_DSIM=m CONFIG_DRM_IMX_DCNANO=y CONFIG_DRM_IMX_DCSS=y CONFIG_DRM_IMX_CDNS_MHDP=y diff --git a/arch/arm64/configs/toradex_imx_v8.config b/arch/arm64/configs/toradex_imx_v8.config index 9be75f6732a3..e392ef72ccd4 100644 --- a/arch/arm64/configs/toradex_imx_v8.config +++ b/arch/arm64/configs/toradex_imx_v8.config @@ -30,6 +30,12 @@ CONFIG_USB_HUB_USB251XB=y # Apalis-iMX8 HDMI CONFIG_DRM_IMX_CDNS_MHDP=y +# Verdin iMX8MP DSI Bridge +# make it a module, otherwise with e.g. native HDMI enabled the kernel +# doesn't boot +CONFIG_DRM_IMX_SEC_DSIM=m +CONFIG_DRM_SEC_MIPI_DSIM=m + # Verdin DSI to LVDS Adapter CONFIG_DRM_TI_SN65DSI83=m |