From: Dave Airlie <airlied@redhat.com>
Date: Thu, 24 Nov 2022 02:38:30 +0000 (+1000)
Subject: Merge tag 'drm-next-20221122' of git://linuxtv.org/pinchartl/media into drm-next
X-Git-Tag: v6.6.17~5843^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9040ef6f68a29114ff77c423d3f78be09391ae97;p=platform%2Fkernel%2Flinux-rpi.git

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
---

9040ef6f68a29114ff77c423d3f78be09391ae97
diff --cc drivers/gpu/drm/rcar-du/Kconfig
index 1065dca,3a57d8d..b2bddbe
--- a/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