Merge tag 'drm-fixes-20221109' of git://linuxtv.org/pinchartl/media into drm-fixes

R-Car DSI Kconfig dependency fix

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y2u8+uM4A006XRPh@pendragon.ideasonboard.com

diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index c959e8c..fd2c2ea 100644 (file)
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -44,13 +44,18 @@ config DRM_RCAR_LVDS
        select OF_FLATTREE
        select OF_OVERLAY
 
-config DRM_RCAR_MIPI_DSI
-       tristate "R-Car DU MIPI DSI Encoder Support"
-       depends on DRM && DRM_BRIDGE && OF
-       select DRM_MIPI_DSI
+config DRM_RCAR_USE_MIPI_DSI
+       bool "R-Car DU MIPI DSI Encoder Support"
+       depends on DRM_BRIDGE && OF
+       default DRM_RCAR_DU
        help
          Enable support for the R-Car Display Unit embedded MIPI DSI encoders.
 
+config DRM_RCAR_MIPI_DSI
+       def_tristate DRM_RCAR_DU
+       depends on DRM_RCAR_USE_MIPI_DSI
+       select DRM_MIPI_DSI
+
 config DRM_RCAR_VSP
        bool "R-Car DU VSP Compositor Support" if ARM
        default y if ARM64