linux-next: build failure after merge of the drm tree

linux-next: build failure after merge of the drm tree

[Mark Brown]

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

Hi all,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

/tmp/next/build/drivers/gpu/drm/xe/xe_survivability_mode.c: In function 'xe_survivability_mode_fini':
/tmp/next/build/drivers/gpu/drm/xe/xe_survivability_mode.c:241:17: error: implicit declaration of function 'xe_nvm_fini'; did you mean 'xe_nvm_init'? [-Wimplicit-function-declaration]
  241 |                 xe_nvm_fini(xe);
      |                 ^~~~~~~~~~~
      |                 xe_nvm_init


Caused by the absence of commit

  11035eab1b7d8 (drm/xe/nvm: Manage nvm aux cleanup with devres)

from the drm-xe tree.  I have ignored this for today, the relevant
commits also seem to have been in the drm tree yesterday.

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

Re: linux-next: build failure after merge of the drm tree

[Stephen Rothwell]

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

Hi all,

On Mon, 28 Apr 2025 13:30:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from drivers/gpu/drm/xe/xe_bo.c:3118:
> drivers/gpu/drm/xe/tests/xe_bo.c: In function 'ccs_test_migrate':
> drivers/gpu/drm/xe/tests/xe_bo.c:63:15: error: too many arguments to function 'xe_bo_evict'
>    63 |         ret = xe_bo_evict(bo, true);
>       |               ^~~~~~~~~~~
> drivers/gpu/drm/xe/xe_bo.c:2939:5: note: declared here
>  2939 | int xe_bo_evict(struct xe_bo *bo)
>       |     ^~~~~~~~~~~
> 
> Caused by commit
> 
>   55df7c0c62c1 ("drm/ttm/xe: drop unused force_alloc flag")
> 
> I have used the drm tree from next-20250424 for today.

The fix for this turned up in the drm-xe tree while I was writing the
above.  I have now used the current drm tree combined with the current
drm-xe tree for today.  So the drm tree on its own is broken as above,
but linux-next is not.

-- 
Cheers,
Stephen Rothwell

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