Merge tag 'drm-misc-next-2025-03-06' of https://gitlab.freedesktop.org/drm/misc/kerne...

drm-misc-next for v6.15:

Cross-subsystem Changes:

base:
- component: Provide helper to query bound status

fbdev:
- fbtft: Remove access to page->index

Core Changes:

- Fix usage of logging macros in several places

gem:
- Add test function for imported dma-bufs and use it in core and helpers
- Avoid struct drm_gem_object.import_attach

tests:
- Fix lockdep warnings

ttm:
- Add helpers for TTM shrinker

Driver Changes:

adp:
- Add support for Apple Touch Bar displays on M1/M2

amdxdna:
- Fix interrupt handling

appletbdrm:
- Add support for Apple Touch Bar displays on x86

bridge:
- synopsys: Add HDMI audio support
- ti-sn65dsi83: Support negative DE polarity

ipu-v3:
- Remove unused code

nouveau:
- Avoid multiple -Wflex-array-member-not-at-end warnings

panthor:
- Fix CS_STATUS_ defines
- Improve locking

rockchip:
- analogix_dp: Add eDP support
- lvds: Improve logging
- vop2: Improve HDMI mode handling; Add support for RK3576
- Fix shutdown
- Support rk3562-mali

xe:
- Use TTM shrinker

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250306130700.GA485504@linux.fritz.box

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/xe/Makefile
index 5ce65ccb3c083f1f63d1ee285f7e5eea955b909f,45cdaab71126e360da6644908423df8d5214d55a..81b8914b877cdfa82428813b1bf458329635786b
--- 1/drivers/gpu/drm/xe/Makefile
--- 2/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@@ -94,12 -90,12 +94,13 @@@ xe-y += xe_bb.o 
        xe_range_fence.o \
        xe_reg_sr.o \
        xe_reg_whitelist.o \
 -      xe_rtp.o \
        xe_ring_ops.o \
 +      xe_rtp.o \
        xe_sa.o \
        xe_sched_job.o \
+       xe_shrinker.o \
        xe_step.o \
 +      xe_survivability_mode.o \
        xe_sync.o \
        xe_tile.o \
        xe_tile_sysfs.o \

diff --cc drivers/gpu/drm/xe/xe_bo.c
index 25761924a8b413ae1a23cc3c15c182283a295ceb,2827cb4618e665e362e728ef91ea40b9f4215940..c21e6bca3141c71a7163203f591c4f075ef2c9f0
--- 1/drivers/gpu/drm/xe/xe_bo.c
--- 2/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@@ -27,8 -25,8 +28,9 @@@
  #include "xe_migrate.h"
  #include "xe_pm.h"
  #include "xe_preempt_fence.h"
 +#include "xe_pxp.h"
  #include "xe_res_cursor.h"
+ #include "xe_shrinker.h"
  #include "xe_trace_bo.h"
  #include "xe_ttm_stolen_mgr.h"
  #include "xe_vm.h"

diff --cc drivers/gpu/drm/xe/xe_bo.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device.c
index 64d3a26ad4a3ed6940569192ccaa4399a80534f6,41ed8ed55015a9be54600cc10662fead94ac46a9..68ef12b57344de125be9999a050d07c4e3fe5a78
--- 1/drivers/gpu/drm/xe/xe_device.c
--- 2/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@@ -49,11 -49,9 +49,12 @@@
  #include "xe_pat.h"
  #include "xe_pcode.h"
  #include "xe_pm.h"
 +#include "xe_pmu.h"
 +#include "xe_pxp.h"
  #include "xe_query.h"
+ #include "xe_shrinker.h"
  #include "xe_sriov.h"
 +#include "xe_survivability_mode.h"
  #include "xe_tile.h"
  #include "xe_ttm_stolen_mgr.h"
  #include "xe_ttm_sys_mgr.h"

diff --cc drivers/gpu/drm/xe/xe_device_types.h
index 4656305dd45a6e8d84359ddcacb238d6f24b4db0,20161344709d98d234a7fb54868ecd8c995c6d59..e312595dda7e5eaddaa70c95457d6f29d9d1ab5a
--- 1/drivers/gpu/drm/xe/xe_device_types.h
--- 2/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@@ -369,9 -372,11 +369,11 @@@ struct xe_device 
        /** @mem: memory info for device */
        struct {
                /** @mem.vram: VRAM info for device */
 -              struct xe_mem_region vram;
 +              struct xe_vram_region vram;
                /** @mem.sys_mgr: system TTM manager */
                struct ttm_resource_manager sys_mgr;
+               /** @mem.sys_mgr: system memory shrinker. */
+               struct xe_shrinker *shrinker;
        } mem;
  
        /** @sriov: device level virtualization data */