Merge tag 'drm-next-20221122' of git://linuxtv.org/pinchartl/media into drm-next

Kconfig fix for RZ/G2L DSI

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

diff --combined drivers/gpu/drm/rcar-du/Kconfig
index 1065dca,3a57d8d..b2bddbe
--- 1/drivers/gpu/drm/rcar-du/Kconfig
--- 2/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@@ -42,21 -42,16 +42,21 @@@ config DRM_RCAR_LVD
        select DRM_KMS_HELPER
        select DRM_PANEL
  
 -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_RZG2L_MIPI_DSI
        tristate "RZ/G2L MIPI DSI Encoder Support"
-       depends on DRM_BRIDGE && OF
+       depends on DRM && DRM_BRIDGE && OF
        depends on ARCH_RENESAS || COMPILE_TEST
        select DRM_MIPI_DSI
        help