From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 May 2025 06:39:25 +0000 (+1000)
Subject: BackMerge tag 'v6.15-rc5' into drm-next
X-Git-Tag: v6.16-rc1~144^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0c67998152bdb91b056160449ee542b86271a5;p=thirdparty%2Flinux.git

BackMerge tag 'v6.15-rc5' into drm-next

Linux 6.15-rc5, requested by tzimmerman for fixes required in drm-next.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

5e0c67998152bdb91b056160449ee542b86271a5
diff --cc .clang-format
index 7630990aa07ae,86c20ee744dec..48405c54ef271
--- a/.clang-format
+++ b/.clang-format
@@@ -690,14 -722,8 +722,15 @@@ ForEachMacros
    - 'v4l2_m2m_for_each_src_buf'
    - 'v4l2_m2m_for_each_src_buf_safe'
    - 'virtio_device_for_each_vq'
 +  - 'vkms_config_for_each_connector'
 +  - 'vkms_config_for_each_crtc'
 +  - 'vkms_config_for_each_encoder'
 +  - 'vkms_config_for_each_plane'
 +  - 'vkms_config_connector_for_each_possible_encoder'
 +  - 'vkms_config_encoder_for_each_possible_crtc'
 +  - 'vkms_config_plane_for_each_possible_crtc'
    - 'while_for_each_ftrace_op'
+   - 'workloads__for_each'
    - 'xa_for_each'
    - 'xa_for_each_marked'
    - 'xa_for_each_range'
diff --cc drivers/gpu/drm/i915/display/intel_display_device.h
index 368b0d3417c26,7a3bb77c7af7c..87c666792c0da
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@@ -158,11 -156,12 +158,12 @@@ struct intel_display_platforms 
  #define HAS_DMC_WAKELOCK(__display)	(DISPLAY_VER(__display) >= 20)
  #define HAS_DOUBLE_BUFFERED_M_N(__display)	(DISPLAY_VER(__display) >= 9 || (__display)->platform.broadwell)
  #define HAS_DOUBLE_WIDE(__display)	(DISPLAY_VER(__display) < 4)
 -#define HAS_DP_MST(__display)		(DISPLAY_INFO(__display)->has_dp_mst)
  #define HAS_DP20(__display)		((__display)->platform.dg2 || DISPLAY_VER(__display) >= 14)
  #define HAS_DPT(__display)		(DISPLAY_VER(__display) >= 13)
 +#define HAS_DP_MST(__display)		(DISPLAY_INFO(__display)->has_dp_mst)
  #define HAS_DSB(__display)		(DISPLAY_INFO(__display)->has_dsb)
  #define HAS_DSC(__display)		(DISPLAY_RUNTIME_INFO(__display)->has_dsc)
+ #define HAS_DSC_3ENGINES(__display)	(DISPLAY_VERx100(__display) == 1401 && HAS_DSC(__display))
  #define HAS_DSC_MST(__display)		(DISPLAY_VER(__display) >= 12 && HAS_DSC(__display))
  #define HAS_FBC(__display)		(DISPLAY_RUNTIME_INFO(__display)->fbc_mask != 0)
  #define HAS_FBC_DIRTY_RECT(__display)	(DISPLAY_VER(__display) >= 30)