]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'drm-msm-next-2026-05-30' of https://gitlab.freedesktop.org/drm/msm into...
authorDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2026 20:41:21 +0000 (06:41 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2026 20:41:22 +0000 (06:41 +1000)
Changes for v7.2

Core:
- Fixed documentation for msm_gem_shrinker functions
- IFPC related enablement/fixes for gen8
- PERFCNTR_CONFIG ioctl support

GPU
- Reworked handling of UBWC configuration
- a810 suppport

MDSS:
- Added Milos platform support
- Reworked handling of UBWC configuration

DisplayPort:
- Reworked HPD handling, preparing for the MST support

DPU:
- Added Milos platform support
- Reworked handling of UBWC configuration

DSI:
- Added Milos platform support

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <rob.clark@oss.qualcomm.com>
Link: https://patch.msgid.link/CACSVV00DXZcvFH2-C3fouve5DGs0DGa-vvsJPuaRmUZZVNKOfg@mail.gmail.com
1  2 
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
drivers/gpu/drm/msm/dp/dp_display.c
drivers/gpu/drm/msm/dp/dp_drm.c
drivers/gpu/drm/msm/dp/dp_drm.h
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/msm/msm_drv.h

Simple merge
Simple merge
index ec76448e71aefc244aaf3c8e1ff0531979a369a6,6c0426803d78c2b46b5947f93e0ca9460177eeb3..041aa026ae2ee217991d16cd3fce92df58fa7a9d
@@@ -25,12 -25,14 +25,14 @@@ int msm_dp_bridge_init(struct msm_dp *m
                   struct drm_encoder *encoder,
                   bool yuv_supported);
  
+ enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge,
+                                              struct drm_connector *connector);
  void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
 -                               struct drm_atomic_state *state);
 +                               struct drm_atomic_commit *state);
  void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
 -                                struct drm_atomic_state *state);
 +                                struct drm_atomic_commit *state);
  void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
 -                                     struct drm_atomic_state *state);
 +                                     struct drm_atomic_commit *state);
  enum drm_mode_status msm_dp_bridge_mode_valid(struct drm_bridge *bridge,
                                          const struct drm_display_info *info,
                                          const struct drm_display_mode *mode);
Simple merge
Simple merge