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>

Dave Airlie committed 1 year ago

Commit ec73e592 parents 366a929 77c8ede3 files · +4 −4Browse files

Unified · Split

3 files

drivers/gpu/drm/xe/xe_bo_evict.c +2 −2
drivers/gpu/drm/xe/xe_configfs.c +1 −1
drivers/gpu/drm/xe/xe_device_sysfs.c +1 −1

drivers/gpu/drm/xe/xe_bo_evict.c+2−2

@@ -158,8 +158,8 @@ int xe_bo_evict_all(struct xe_device *xe) · 157 unmodified lines
158	if (ret)	158	if (ret)
159	return ret;	159	return ret;
160		160
161	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,	161	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.external,
162	&xe->pinned.late.evicted, xe_bo_evict_pinned);	162	&xe->pinned.late.external, xe_bo_evict_pinned);
163		163
164	if (!ret)	164	if (!ret)
165	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,	165	ret = xe_bo_apply_to_pinned(xe, &xe->pinned.late.kernel_bo_present,

drivers/gpu/drm/xe/xe_configfs.c+1−1

@@ -404,7 +404,7 @@ int __init xe_configfs_init(void) · 403 unmodified lines
404	return 0;	404	return 0;
405	}	405	}
406		406
407	void __exit xe_configfs_exit(void)	407	void xe_configfs_exit(void)
408	{	408	{
409	configfs_unregister_subsystem(&xe_configfs);	409	configfs_unregister_subsystem(&xe_configfs);
410	}	410	}

drivers/gpu/drm/xe/xe_device_sysfs.c+1−1

@@ -308,7 +308,7 @@ int xe_device_sysfs_init(struct xe_device *xe) · 307 unmodified lines
308	return ret;	308	return ret;
309	}	309	}
310		310
311	if (xe->info.platform == XE_BATTLEMAGE) {	311	if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {
312	ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);	312	ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);
313	if (ret)	313	if (ret)
314	goto cleanup;	314	goto cleanup;