Skip to contentSkip to conversation

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

PATCH Stephen Rothwell 2 participants 2 messages Feb 13, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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:42:
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1559:13: error: 'amdgpu_choose_low_power_state' defined but not used [-Werror=unused-function]
1559 | static void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }

      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

(and many, many more)

Caused by commit

c77536b15b7a ("drm/amd: Stop evicting resources on APUs in suspend")

I have applied the following patch for today.

From: Stephen Rothwell <[email protected]>
Date: Tue, 13 Feb 2024 14:41:05 +1100
Subject: [PATCH] fixup for "drm/amd: Stop evicting resources on APUs in suspend"

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
index 2a3f12bae823..2cf4fb3f7751 100644
@@ -1556,7 +1556,7 @@ void amdgpu_choose_low_power_state(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 void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }
+static inline void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }
 #endif
 
 #if defined(CONFIG_DRM_AMD_DC)
Signature · 5 lines
2.43.0

-- 
Cheers,
Stephen Rothwell
#1 lore raw

Thanks. I've squashed the fix in.

Alex

Quoted 48 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:42:
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1559:13: error: 'amdgpu_choose_low_power_state' defined but not used [-Werror=unused-function]
1559 | static void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }

      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

(and many, many more)

Caused by commit

c77536b15b7a ("drm/amd: Stop evicting resources on APUs in suspend")

I have applied the following patch for today.

From: Stephen Rothwell <[email protected]>
Date: Tue, 13 Feb 2024 14:41:05 +1100
Subject: [PATCH] fixup for "drm/amd: Stop evicting resources on APUs in suspend"

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -2
index 2a3f12bae823..2cf4fb3f7751 100644
@@ -1556,7 +1556,7 @@ void amdgpu_choose_low_power_state(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 void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }
+static inline void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }
 #endif
 
 #if defined(CONFIG_DRM_AMD_DC)
--

2.43.0

--
Cheers,
Stephen Rothwell