summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2022-11-11 08:11:18 +1000
committerDave Airlie <airlied@redhat.com>2022-11-11 08:11:26 +1000
commit42bf3ce70f2a969a1a92b797f8c690d43f968b1d (patch)
tree350c9a7fa1aee2b5e52cf473b219a538ef16b138
parent2e4b294576e32fb02562ad6839d6888ab7b45102 (diff)
parenta830a15678593948f3271a5a398c9b67d8beedb9 (diff)
downloadlinux-stable-42bf3ce70f2a969a1a92b797f8c690d43f968b1d.tar.gz
linux-stable-42bf3ce70f2a969a1a92b797f8c690d43f968b1d.tar.bz2
linux-stable-42bf3ce70f2a969a1a92b797f8c690d43f968b1d.zip
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
-rw-r--r--drivers/gpu/drm/rcar-du/Kconfig13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index c959e8c6be7d..fd2c2eaee26b 100644
--- 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