Commit ae9e8654 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2026-02-19' of... 

Merge tag 'drm-xe-next-fixes-2026-02-19' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

UAPI Changes:
 - drm/xe: Prevent VFs from exposing the CCS mode sysfs file (Nareshkumar)

Cross-subsystem Changes:
 - drm/pagemap: pass pagemap_addr by reference (Arnd)

Driver Changes:
 - SRIOV related fixes (Michal, Piotr)
 - PAT cache fix (Jia)
 - MMIO read fix (Shuicheng)
 - W/a fixes (Roper)
 - Adjust type of xe_modparam.force_vram_bar_size (Shuicheng)
 - Wedge mode fix (Raag)
 - HWMon fix (Karthik)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aZeR6CXDRbeudIVR@intel.com
parents 7a4a583d 2d01d88a

drivers/gpu/drm/drm_gpusvm.c

+1 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static void __drm_gpusvm_unmap_pages(struct drm_gpusvm *gpusvm, 
					       addr->dir);

			else if (dpagemap && dpagemap->ops->device_unmap)

				dpagemap->ops->device_unmap(dpagemap,

							    dev, *addr);

							    dev, addr);

			i += 1 << addr->order;

		}

drivers/gpu/drm/drm_pagemap.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static void drm_pagemap_migrate_unmap_pages(struct device *dev, 
			struct drm_pagemap_zdd *zdd = page->zone_device_data;

			struct drm_pagemap *dpagemap = zdd->dpagemap;



			dpagemap->ops->device_unmap(dpagemap, dev, pagemap_addr[i]);

			dpagemap->ops->device_unmap(dpagemap, dev, &pagemap_addr[i]);

		} else {

			dma_unmap_page(dev, pagemap_addr[i].addr,

				       PAGE_SIZE << pagemap_addr[i].order, dir);

drivers/gpu/drm/xe/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ static vm_fault_t xe_bo_cpu_fault(struct vm_fault *vmf) 
	int err = 0;

	int idx;



	if (!drm_dev_enter(&xe->drm, &idx))

	if (xe_device_wedged(xe) || !drm_dev_enter(&xe->drm, &idx))

		return ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);



	ret = xe_bo_cpu_fault_fastpath(vmf, xe, bo, needs_rpm);

drivers/gpu/drm/xe/xe_configfs.h

+8 −4
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev); 
bool xe_configfs_media_gt_allowed(struct pci_dev *pdev);

u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev);

bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev);

u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class,

u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev,

				       enum xe_engine_class class,

				       const u32 **cs);

u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class,

u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev,

					enum xe_engine_class class,

					const u32 **cs);

#ifdef CONFIG_PCI_IOV

unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev);
@@ -37,9 +39,11 @@ static inline bool xe_configfs_primary_gt_allowed(struct pci_dev *pdev) { return 
static inline bool xe_configfs_media_gt_allowed(struct pci_dev *pdev) { return true; }

static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; }

static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; }

static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum xe_engine_class,

static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev,

						     enum xe_engine_class class,

						     const u32 **cs) { return 0; }

static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class,

static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev,

						      enum xe_engine_class class,

						      const u32 **cs) { return 0; }

static inline unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev) { return UINT_MAX; }

#endif

drivers/gpu/drm/xe/xe_gt_ccs_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int xe_gt_ccs_mode_sysfs_init(struct xe_gt *gt) 
	struct xe_device *xe = gt_to_xe(gt);

	int err;



	if (!xe_gt_ccs_mode_enabled(gt))

	if (!xe_gt_ccs_mode_enabled(gt) || IS_SRIOV_VF(xe))

		return 0;



	err = sysfs_create_files(gt->sysfs, gt_ccs_mode_attrs);