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

From: Stephen Rothwell
Date: Mon Oct 07 2024 - 22:56:20 EST


Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 's3_debug_store':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5209:35: error: passing argument 1 of 'dm_resume' from incompatible pointer type [-Wincompatible-pointer-types]
5209 | dm_resume(adev);
| ^~~~
| |
| struct amdgpu_device *
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3152:46: note: expected 'struct amdgpu_ip_block *' but argument is of type 'struct amdgpu_device *'
3152 | static int dm_resume(struct amdgpu_ip_block *ip_block)
| ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5212:36: error: passing argument 1 of 'dm_suspend' from incompatible pointer type [-Wincompatible-pointer-types]
5212 | dm_suspend(adev);
| ^~~~
| |
| struct amdgpu_device *
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2963:47: note: expected 'struct amdgpu_ip_block *' but argument is of type 'struct amdgpu_device *'
2963 | static int dm_suspend(struct amdgpu_ip_block *ip_block)
| ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~

Caused by commits

982d7f9bfe4a ("drm/amdgpu: update the handle ptr in suspend")
7feb4f3ad8be ("drm/amdgpu: update the handle ptr in resume")

I have used the amdgpu tree from next-20241004 for today.

--
Cheers,
Stephen Rothwell

Attachment: pgpWUthj4Ralj.pgp
Description: OpenPGP digital signature