linux-next: manual merge of the drm-xe tree with the drm-fixes tree

linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/xe_guc_submit.c

between commit:

  26caeae9fb482 ("drm/xe/guc: Set RCS/CCS yield policy")

from the drm-fixes tree and commit:

  88434448438e4 ("drm/xe/guc: Set RCS/CCS yield policy")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/xe/xe_guc_submit.c
index e377ba3a39b3a,53024eb5670b7..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1927 bytes --]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/xe_nvm.c

between commit:

  8a44241b0b83a ("drm/xe/nvm: Fix double-free on aux add failure")

from the drm-fixes tree and commits:

  11035eab1b7d8 ("drm/xe/nvm: Manage nvm aux cleanup with devres")
  a3187c0c2bbd9 ("drm/xe/nvm: Fix double-free on aux add failure")
  7755ed58a49f4 ("drm/xe/nvm: Defer xe->nvm assignment until init succeeds")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpu/drm/xe/xe_nvm.c
index 6f9dd519371c9,bc88804de5146..0000000000000
--- a/drivers/gpu/drm/xe/xe_nvm.c
+++ b/drivers/gpu/drm/xe/xe_nvm.c
@@@ -133,12 -133,10 +133,10 @@@ int xe_nvm_init(struct xe_device *xe
  	if (WARN_ON(xe->nvm))
  		return -EFAULT;
  
- 	xe->nvm = kzalloc(sizeof(*nvm), GFP_KERNEL);
- 	if (!xe->nvm)
+ 	nvm = kzalloc(sizeof(*nvm), GFP_KERNEL);
+ 	if (!nvm)
  		return -ENOMEM;
  
- 	nvm = xe->nvm;
- 
  	nvm->writable_override = xe_nvm_writable_override(xe);
  	nvm->non_posted_erase = xe_nvm_non_posted_erase(xe);
  	nvm->bar.parent = &pdev->resource[0];
@@@ -165,7 -163,6 +163,6 @@@
  	if (ret) {
  		drm_err(&xe->drm, "xe-nvm aux init failed %d\n", ret);
  		kfree(nvm);
- 		xe->nvm = NULL;
  		return ret;
  	}
  
@@@ -173,8 -170,9 +170,9 @@@
  	if (ret) {
  		drm_err(&xe->drm, "xe-nvm aux add failed %d\n", ret);
  		auxiliary_device_uninit(aux_dev);
- 		xe->nvm = NULL;
  		return ret;
  	}
+ 
+ 	xe->nvm = nvm;
  	return devm_add_action_or_reset(xe->drm.dev, xe_nvm_fini, xe);
  }

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  include/drm/drm_pagemap.h

between commit:

  bdcdf968be314 ("drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE")

from the drm-fixes tree and commit:

  1e372b246199c ("drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/drm/drm_pagemap.h
index b7a78c1ca7670,2baf0861f78f3..0000000000000
--- a/include/drm/drm_pagemap.h
+++ b/include/drm/drm_pagemap.h

linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1632 bytes --]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/xe_guc_submit.c

between commit:

  ff89a4d285c82 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init")

from the drm-fixes tree and commit:

  fb3c27a69c473 ("drm/xe/sysfs: Simplify sysfs registration")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/xe/xe_device_sysfs.c
index b7f8fcfed8d86,c5151c86a98ae..0000000000000
--- a/drivers/gpu/drm/xe/xe_device_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_device_sysfs.c
@@@ -308,19 -290,15 +290,15 @@@ int xe_device_sysfs_init(struct xe_devi
  			return ret;
  	}
  
- 	if (xe->info.platform == XE_BATTLEMAGE) {
- 		ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);
+ 	if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {
+ 		ret = devm_device_add_group(dev, &auto_link_downgrade_attr_group);
  		if (ret)
 -			return ret;
 +			goto cleanup;
  
- 		ret = late_bind_create_files(dev);
+ 		ret = devm_device_add_group(dev, &late_bind_attr_group);
  		if (ret)
 -			return ret;
 +			goto cleanup;
  	}
  
- 	return devm_add_action_or_reset(dev, xe_device_sysfs_fini, xe);
- 
- cleanup:
- 	xe_device_sysfs_fini(xe);
- 	return ret;
+ 	return 0;
  }

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Nathan Chancellor]

Hi Mark,

On Fri, Sep 19, 2025 at 01:45:19PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the drm-xe tree got a conflict in:
> 
>   drivers/gpu/drm/xe/xe_guc_submit.c
> 
> between commit:
> 
>   ff89a4d285c82 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init")
> 
> from the drm-fixes tree and commit:
> 
>   fb3c27a69c473 ("drm/xe/sysfs: Simplify sysfs registration")
> 
> from the drm-xe tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/gpu/drm/xe/xe_device_sysfs.c
> index b7f8fcfed8d86,c5151c86a98ae..0000000000000
> --- a/drivers/gpu/drm/xe/xe_device_sysfs.c
> +++ b/drivers/gpu/drm/xe/xe_device_sysfs.c
> @@@ -308,19 -290,15 +290,15 @@@ int xe_device_sysfs_init(struct xe_devi
>   			return ret;
>   	}
>   
> - 	if (xe->info.platform == XE_BATTLEMAGE) {
> - 		ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);
> + 	if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {
> + 		ret = devm_device_add_group(dev, &auto_link_downgrade_attr_group);
>   		if (ret)
>  -			return ret;
>  +			goto cleanup;
>   
> - 		ret = late_bind_create_files(dev);
> + 		ret = devm_device_add_group(dev, &late_bind_attr_group);
>   		if (ret)
>  -			return ret;
>  +			goto cleanup;
>   	}
>   
> - 	return devm_add_action_or_reset(dev, xe_device_sysfs_fini, xe);
> - 
> - cleanup:
> - 	xe_device_sysfs_fini(xe);
> - 	return ret;
> + 	return 0;
>   }

This resolution breaks the build.

  drivers/gpu/drm/xe/xe_device_sysfs.c: In function 'xe_device_sysfs_init':
  drivers/gpu/drm/xe/xe_device_sysfs.c:300:25: error: label 'cleanup' used but not defined
    300 |                         goto cleanup;
        |                         ^~~~

I think those should just be 'return ret', as it appears that
fb3c27a69c473 already includes ff89a4d285c82, so I think you can just
take the right side of the conflict wholesale.

Cheers,
Nathan

Re: linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Lucas De Marchi]

On Mon, Sep 22, 2025 at 11:28:32AM -0700, Nathan Chancellor wrote:
>Hi Mark,
>
>On Fri, Sep 19, 2025 at 01:45:19PM +0100, Mark Brown wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-xe tree got a conflict in:
>>
>>   drivers/gpu/drm/xe/xe_guc_submit.c
>>
>> between commit:
>>
>>   ff89a4d285c82 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init")
>>
>> from the drm-fixes tree and commit:
>>
>>   fb3c27a69c473 ("drm/xe/sysfs: Simplify sysfs registration")
>>
>> from the drm-xe tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>> diff --cc drivers/gpu/drm/xe/xe_device_sysfs.c
>> index b7f8fcfed8d86,c5151c86a98ae..0000000000000
>> --- a/drivers/gpu/drm/xe/xe_device_sysfs.c
>> +++ b/drivers/gpu/drm/xe/xe_device_sysfs.c
>> @@@ -308,19 -290,15 +290,15 @@@ int xe_device_sysfs_init(struct xe_devi
>>   			return ret;
>>   	}
>>
>> - 	if (xe->info.platform == XE_BATTLEMAGE) {
>> - 		ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs);
>> + 	if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) {
>> + 		ret = devm_device_add_group(dev, &auto_link_downgrade_attr_group);
>>   		if (ret)
>>  -			return ret;
>>  +			goto cleanup;
>>
>> - 		ret = late_bind_create_files(dev);
>> + 		ret = devm_device_add_group(dev, &late_bind_attr_group);
>>   		if (ret)
>>  -			return ret;
>>  +			goto cleanup;
>>   	}
>>
>> - 	return devm_add_action_or_reset(dev, xe_device_sysfs_fini, xe);
>> -
>> - cleanup:
>> - 	xe_device_sysfs_fini(xe);
>> - 	return ret;
>> + 	return 0;
>>   }
>
>This resolution breaks the build.
>
>  drivers/gpu/drm/xe/xe_device_sysfs.c: In function 'xe_device_sysfs_init':
>  drivers/gpu/drm/xe/xe_device_sysfs.c:300:25: error: label 'cleanup' used but not defined
>    300 |                         goto cleanup;
>        |                         ^~~~
>
>I think those should just be 'return ret', as it appears that
>fb3c27a69c473 already includes ff89a4d285c82, so I think you can just
>take the right side of the conflict wholesale.

yes, taking the right side is the correct resolution.

thanks
Lucas De Marchi

>
>Cheers,
>Nathan

linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 992 bytes --]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/xe_devcoredump.c

between commit:

  5dce85fecb877 ("drm/xe: Move the coredump registration to the worker thread")

from the drm-fixes tree and commits:

  90f51a7f4ec10 ("drm/xe: Move the coredump registration to the worker thread")
  906c4b306e934 ("drm/xe: Add mutex locking to devcoredump")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.


diff --cc drivers/gpu/drm/xe/xe_devcoredump.c
index f8947e7e917ec,71636e80b71da..0000000000000
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]