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>

diff --cc .clang-format
index 7630990aa07aec9034d438cf9659cbf0998b68a6,86c20ee744dec138d5418f5fb905ed852698c741..48405c54ef271e9546da08893d200a4cf48f3a55
--- 1/.clang-format
--- 2/.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 MAINTAINERS
Simple merge

diff --cc drivers/accel/ivpu/ivpu_drv.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_pm.c
Simple merge

diff --cc drivers/dma-buf/sw_sync.c
Simple merge

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_device.h
index 368b0d3417c26f6977946918f906f6c62c2dadfc,7a3bb77c7af7c2473d9555494171c9f0d43ac256..87c666792c0dacb06c3c5872490b1fa55c281aec
--- 1/drivers/gpu/drm/i915/display/intel_display_device.h
--- 2/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)

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_encoder_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_fence.c
Simple merge

diff --cc drivers/gpu/drm/tests/drm_gem_shmem_test.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/v3d/v3d_sched.c
Simple merge

diff --cc include/drm/drm_gem.h
Simple merge