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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thanks for the fix.

Alex if no concerns I'll push this patch from Stephen to amd-staging-drm-next with my tag.

On 1/31/2022 21:32, Stephen Rothwell wrote:
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 <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 1 Feb 2022 14:24:40 +1100
Subject: [PATCH] drm/amd: fix semicolon positioning

Fixes: 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>

---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index e61078cec072..2931c8ff4cc6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -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,




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux