Merge drm/drm-next into drm-xe-next

Backmerge to bring in linux 6.15-rc.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

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

diff --cc drivers/gpu/drm/xe/xe_oa.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_svm.c
index d927f50f2a6841cd81bb79e0e5c34b3669273d69,f8c128524d9f33d5cdc2253b3e8b643e7e7eb96a..890f6b2f40e93068bf86a2d69d7361b7415eb40b
--- 1/drivers/gpu/drm/xe/xe_svm.c
--- 2/drivers/gpu/drm/xe/xe_svm.c
+++ b/drivers/gpu/drm/xe/xe_svm.c
@@@ -340,11 -339,9 +340,11 @@@ static void xe_svm_garbage_collector_wo
        up_write(&vm->lock);
  }
  
 +#if IS_ENABLED(CONFIG_DRM_XE_DEVMEM_MIRROR)
 +
  static struct xe_vram_region *page_to_vr(struct page *page)
  {
-       return container_of(page->pgmap, struct xe_vram_region, pagemap);
+       return container_of(page_pgmap(page), struct xe_vram_region, pagemap);
  }
  
  static struct xe_tile *vr_to_tile(struct xe_vram_region *vr)