Skip to content

Commit ec73e59

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://lore.kernel.org/r/aNU-FkJEcA3T4aDB@intel.com
2 parents 366a929 + 77c8ede commit ec73e59

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/gpu/drm/xe/xe_bo_evict.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ int xe_bo_evict_all(struct xe_device *xe)
158158
if (ret)
159159
return ret;
160160

161-
ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,
162-
&xe->pinned.late.evicted, xe_bo_evict_pinned);
161+
ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.external,
162+
&xe->pinned.late.external, xe_bo_evict_pinned);
163163

164164
if (!ret)
165165
ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,

drivers/gpu/drm/xe/xe_configfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ int __init xe_configfs_init(void)
404404
return 0;
405405
}
406406

407-
void __exit xe_configfs_exit(void)
407+
void xe_configfs_exit(void)
408408
{
409409
configfs_unregister_subsystem(&xe_configfs);
410410
}

drivers/gpu/drm/xe/xe_device_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ int xe_device_sysfs_init(struct xe_device *xe)
308308
return ret;
309309
}
310310

311-
if (xe->info.platform == XE_BATTLEMAGE) {
311+
if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {
312312
ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);
313313
if (ret)
314314
goto cleanup;

0 commit comments

Comments
 (0)