Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

PATCH [email protected] 2 participants 4 messages Sep 20, 2021 1 message not in the archive

Subsystems (3)
Stable branch DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 114518ff3b30a3f0611f384fb58e0a968fdf7f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
Date: Thu, 9 Sep 2021 18:56:28 +0200
Subject: [PATCH] drm/amdgpu: Drop inline from
amdgpu_ras_eeprom_max_record_count
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was unusual; normally, inline functions are declared static as well, and defined in a header file if used by multiple compilation units. The latter would be more involved in this case, so just drop the inline declaration for now.

Fixes compile failure building for ppc64le on RHEL 8:

In file included from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h:32,

                 from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:33:
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c: In function ‘amdgpu_ras_recovery_init’:
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h:90:17: error: inlining failed in call
 to ‘always_inline’ ‘amdgpu_ras_eeprom_max_record_count’: function body not available
   90 | inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1985:34: note: called from here
 1985 |         max_eeprom_records_len = amdgpu_ras_eeprom_max_record_count();
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes c84d46707ebb "drm/amdgpu: validate bad page threshold in ras(v3)"
Reviewed-by Lyude Paul <[email protected]>
Signed-off-by Michel Dänzer <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +1 -1
index dc44c946a244..98732518543e 100644
@@ -757,7 +757,7 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control,
 	return res;
 }
 
-inline uint32_t amdgpu_ras_eeprom_max_record_count(void)
+uint32_t amdgpu_ras_eeprom_max_record_count(void)
 {
 	return RAS_MAX_RECORD_COUNT;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +1 -1
index f95fc61b3021..6bb00578bfbb 100644
@@ -120,7 +120,7 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control,
 int amdgpu_ras_eeprom_append(struct amdgpu_ras_eeprom_control *control,
 			     struct eeprom_table_record *records, const u32 num);
 
-inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
+uint32_t amdgpu_ras_eeprom_max_record_count(void);
 
 void amdgpu_ras_debugfs_set_ret_size(struct amdgpu_ras_eeprom_control *control);

A message that is not in the archive (sent off-list or not yet received): [email protected]

author maintainer
#2 lore raw
Quoted 7 lines · Michel Dänzer
Quoted 5 lines · On 2021-09-20 10:52, [email protected] wrote:

The patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines

I wrote a comment above the Fixes line:

# The function is called amdgpu_ras_eeprom_get_record_max_length on

# stable branches

Looks like that got lost somewhere along the way.

Can you send a working patch for these older kernels that I can queue up?

thanks,

greg k-h

#3 lore raw
Quoted 10 lines · Greg KH
Quoted 9 lines · Michel Dänzer
Quoted 5 lines · On 2021-09-20 10:52, [email protected] wrote:

The patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

I wrote a comment above the Fixes line:

Quoted 8 lines
Quoted 5 lines

# The function is called amdgpu_ras_eeprom_get_record_max_length on

# stable branches

Looks like that got lost somewhere along the way.

Can you send a working patch for these older kernels that I can queue up?

Actually, it's not critical to have this on the stable branches, let's just drop it.

Signature · 2 lines
Earthling Michel Dänzer               |               https://redhat.com
Libre software enthusiast             |             Mesa and X developer
author maintainer
#4 lore raw
Quoted 15 lines · Michel Dänzer
Quoted 14 lines · Greg KH
Quoted 13 lines · Michel Dänzer
Quoted 5 lines · On 2021-09-20 10:52, [email protected] wrote:

The patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

I wrote a comment above the Fixes line:

# The function is called amdgpu_ras_eeprom_get_record_max_length on

# stable branches
Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Looks like that got lost somewhere along the way.

Can you send a working patch for these older kernels that I can queue up?

Actually, it's not critical to have this on the stable branches, let's just drop it.

Fine with me, thanks!

greg k-h