Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmjVPawACgkQ+mJfZA7r
 E8q80Af8Cn2p4K8sMkpTNTf9dyd2hnUfRsAWt48WoU8ePn/sKaQgqYlZFMR7UhnC
 q7eov4PEUI+oMJLOTxa0TJej1ejotq7fUd1jTD9XVpmvfBlU0u02bp/pPmBPCc4N
 dRDW+YylfWwcgE1+xDEIMvH0Z1/c4pST16UKKegqSyceXaannC+bTNvQ3Jxuw8GC
 leyGcNuvdO/VNpRYKTKqbsmzM55MF2cGMYmi3POXpEJV9n1g26bPHH/+25A3bFK3
 ATu9QmvqXwrGYeZMa+0ZrfUWCTz9FjUFgZefslybuLxfSN4x6WFcMUk0Ox9fTplv
 tqyqbv1u1gHYM/EeFLEJOSNkZF/l3w==
 =LhUK
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Dave Airlie 2025-09-26 14:12:28 +10:00
parent 366a929507 77c8ede611
commit ec73e5984e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/xe/xe_bo_evict.c
View File

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

2
drivers/gpu/drm/xe/xe_configfs.c
View File

@ -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);
}

2
drivers/gpu/drm/xe/xe_device_sysfs.c
View File

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