linux-next: build failure after merge of the amdgpu tree
Subsystems (3)
Hi all,
After merging the amdgpu tree, today's linux-next build (powerpc allyesconfig) failed like this:
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token
1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
| ^~
| ;(and many more)
Caused by commit
11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
I have applied the following patch for today.
From: Stephen Rothwell <[email protected]>
Date: Tue, 1 Feb 2022 14:24:40 +1100
Subject: [PATCH] drm/amd: fix semicolon positioning
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev);#else static inline bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev) {return false; } -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false }; +static inline bool amdgpu_acpi_is_s3_active (struct amdgpu_device *adev) {return false; }#endif int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
Signature · 5 lines
2.34.1 -- Cheers, Stephen Rothwell
Thanks for the fix.
Alex if no concerns I'll push this patch from Stephen to amd-staging-drm-next with my tag.
Quoted 18 lines · Stephen Rothwell
Hi all,
After merging the amdgpu tree, today's linux-next build (powerpc allyesconfig) failed like this:
In file included from
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false }; | ^~ | ;(and many more)
Caused by commit
11bc42ea179d("drm/amd: add support to check whether the system is set to s3")
Quoted 8 lines
I have applied the following patch for today.
From: Stephen Rothwell <[email protected]>
Date: Tue, 1 Feb 2022 14:24:40 +1100
Subject: [PATCH] drm/amd: fix semicolon positioningFixes 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")Signed-off-by Stephen Rothwell <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev);#else static inline bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev) {return false; } -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false }; +static inline bool amdgpu_acpi_is_s3_active (struct amdgpu_device *adev) {return false; }#endif int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
Go for it. I'll squash it into my next -next update.
Alex
Quoted 54 lines · Mario
Thanks for the fix.
Alex if no concerns I'll push this patch from Stephen to amd-staging-drm-next with my tag.
Quoted 18 lines · Stephen Rothwell
Hi all,
After merging the amdgpu tree, today's linux-next build (powerpc allyesconfig) failed like this:
In file included from
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false }; | ^~ | ;(and many more)
Caused by commit
11bc42ea179d("drm/amd: add support to check whether the system is set to s3")Quoted 8 lines
I have applied the following patch for today.
From: Stephen Rothwell <[email protected]>
Date: Tue, 1 Feb 2022 14:24:40 +1100
Subject: [PATCH] drm/amd: fix semicolon positioningFixes 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")Signed-off-by Stephen Rothwell <[email protected]>Signed-off-by Mario Limonciello <[email protected]>Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev);#else static inline bool amdgpu_acpi_is_s0ix_active (struct amdgpu_device *adev) {return false; } -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false }; +static inline bool amdgpu_acpi_is_s3_active (struct amdgpu_device *adev) {return false; }#endif int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,