From: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Date: Thu, 24 Apr 2025 11:34:55 +0000 (+0200)
Subject: Merge drm/drm-next into drm-xe-next
X-Git-Tag: v6.16-rc1~144^2~17^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ab7ae8e07f888f223027f0ef84d33e43919ad55;p=thirdparty%2Flinux.git

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>
---

3ab7ae8e07f888f223027f0ef84d33e43919ad55
diff --cc drivers/gpu/drm/xe/xe_svm.c
index d927f50f2a684,f8c128524d9f3..890f6b2f40e93
--- a/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)