From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Wed, 11 Sep 2024 07:48:49 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v6.13-rc1~122^2~23^2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61b86391fb5d7b9cad35169b1660119754a01134;p=thirdparty%2Fkernel%2Fstable.git

Merge drm/drm-next into drm-misc-next

Backmerging to get fixes from v6.12-rc7.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---

61b86391fb5d7b9cad35169b1660119754a01134
diff --cc drivers/gpu/drm/display/Kconfig
index a2e42014ffe05,3b824e01c9b56..0f07cf1483ffc
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@@ -59,15 -64,8 +64,14 @@@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBU
  
  	  If in doubt, say "N".
  
 +config DRM_DISPLAY_DSC_HELPER
 +	bool
 +	depends on DRM_DISPLAY_HELPER
 +	help
 +	  DRM display helpers for VESA DSC (used by DSI and DisplayPort).
 +
  config DRM_DISPLAY_HDCP_HELPER
  	bool
- 	depends on DRM_DISPLAY_HELPER
  	help
  	  DRM display helpers for HDCP.