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 --cc drivers/gpu/drm/rcar-du/Kconfig
index 1065dca885efd00ed39970ff538e5e3e4bd5ba8b,3a57d8d792ee1703f6ccfc0b59712d8f48496c12..b2bddbeca8786a9cd4ffaf719d5ff878e8b9d10d
--- 1/drivers/gpu/drm/rcar-du/Kconfig
--- 2/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@@ -49,14 -49,9 +49,14 @@@ config DRM_RCAR_USE_MIPI_DS
        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