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

Merge tag 'drm-xe-fixes-2025-09-25' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- Don't expose sysfs attributes not applicable for VFs (Michal)
- Fix build with CONFIG_MODULES=n (Lucas)
- Don't copy pinned kernel bos twice on suspend (Thomas)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/aNU-FkJEcA3T4aDB@intel.com
parents 366a9295 77c8ede6

drivers/gpu/drm/xe/xe_bo_evict.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ int xe_bo_evict_all(struct xe_device *xe) 
	if (ret)

		return ret;



	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,

				    &xe->pinned.late.evicted, xe_bo_evict_pinned);

	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.external,

				    &xe->pinned.late.external, xe_bo_evict_pinned);



	if (!ret)

		ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,

drivers/gpu/drm/xe/xe_configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ int __init xe_configfs_init(void) 
	return 0;

}



void __exit xe_configfs_exit(void)

void xe_configfs_exit(void)

{

	configfs_unregister_subsystem(&xe_configfs);

}

drivers/gpu/drm/xe/xe_device_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ int xe_device_sysfs_init(struct xe_device *xe) 
			return ret;

	}



	if (xe->info.platform == XE_BATTLEMAGE) {

	if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {

		ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);

		if (ret)

			goto cleanup;