2022-04-13 05:45:21

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the amdgpu tree

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
798 | if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")

Please start including an x86_64 allmodconfig build in your local testing.

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

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2022-04-13 16:40:24

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

The patch should be there now.

Alex

On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
<[email protected]> wrote:
>
> [AMD Official Use Only]
>
>
> hi Stephen,
>
> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>
> ~~~~
> eb2bb029bacf David Zhang 12 days ago drm: add PSR2 support and capability definition as per eDP 1.5
> ~~~~~
>
> Thanks
> David
> ________________________________ From: Stephen Rothwell
> Sent: Tuesday, April 12, 2022 10:32 PM
> To: Alex Deucher
> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
> Subject: linux-next: build failure after merge of the amdgpu tree
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
> 798 | if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
> 901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>
> Please start including an x86_64 allmodconfig build in your local testing.
>
> I have used the amdgpu tree from next-20220412 for today.
>
> --
> Cheers,
> Stephen Rothwell

2022-04-15 15:29:15

by Rodrigo Siqueira Jordao

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree



On 2022-04-14 10:27, Alex Deucher wrote:
> On Thu, Apr 14, 2022 at 10:23 AM Rodrigo Siqueira Jordao
> <[email protected]> wrote:
>>
>> Hi Alex,
>>
>> Do we need to apply David's patch [1] to drm-misc-next? If so, I can
>> merge it there. Also, I noticed that drm-misc-next changed the dp header
>> path; in that way, I had to change the original patch a little bit.
>>
>> 1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1>>>
>
> Ideally it would have gone through drm-misc, but since we are the only
> ones using it at this point, I think it's ok to take through my tree.
> I'll make a note about the path change when I send the PR.

Ok, Next time I'll try to push this type of patch directly to drm-misc-next.

Thanks
Siqueira

> Alex
>
>> Best Regards,
>> Siqueira
>>
>> On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
>>> [AMD Official Use Only]
>>>
>>>
>>> Thanks for clarifying, Alex.
>>> ------------------------------------------------------------------------
>>> *From:* Alex Deucher <[email protected]>
>>> *Sent:* Wednesday, April 13, 2022 10:18 AM
>>> *To:* Zhang, Dingchen (David) <[email protected]>
>>> *Cc:* Stephen Rothwell <[email protected]>; Kotarac, Pavle
>>> <[email protected]>; Chung, ChiaHsuan (Tom)
>>> <[email protected]>; Linux Kernel Mailing List
>>> <[email protected]>; Linux Next Mailing List
>>> <[email protected]>
>>> *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
>>> The patch should be there now.
>>>
>>> Alex
>>>
>>> On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
>>> <[email protected]> wrote:
>>>>
>>>> [AMD Official Use Only]
>>>>
>>>>
>>>> hi Stephen,
>>>>
>>>> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>>>>
>>>> ~~~~
>>>> eb2bb029bacf David Zhang 12 days ago drm: add PSR2 support and capability definition as per eDP 1.5
>>>> ~~~~~
>>>>
>>>> Thanks
>>>> David
>>>> ________________________________ From: Stephen Rothwell
>>>> Sent: Tuesday, April 12, 2022 10:32 PM
>>>> To: Alex Deucher
>>>> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
>>>> Subject: linux-next: build failure after merge of the amdgpu tree
>>>>
>>>> Hi all,
>>>>
>>>> After merging the amdgpu tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
>>>> 798 | if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
>>>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> | DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>>>>
>>>> Caused by commit
>>>>
>>>> 901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>>>>
>>>> Please start including an x86_64 allmodconfig build in your local testing.
>>>>
>>>> I have used the amdgpu tree from next-20220412 for today.
>>>>
>>>> --
>>>> Cheers,
>>>> Stephen Rothwell
>>

2022-04-16 01:38:25

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

On Thu, Apr 14, 2022 at 10:23 AM Rodrigo Siqueira Jordao
<[email protected]> wrote:
>
> Hi Alex,
>
> Do we need to apply David's patch [1] to drm-misc-next? If so, I can
> merge it there. Also, I noticed that drm-misc-next changed the dp header
> path; in that way, I had to change the original patch a little bit.
>
> 1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1
>

Ideally it would have gone through drm-misc, but since we are the only
ones using it at this point, I think it's ok to take through my tree.
I'll make a note about the path change when I send the PR.

Alex

> Best Regards,
> Siqueira
>
> On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
> > [AMD Official Use Only]
> >
> >
> > Thanks for clarifying, Alex.
> > ------------------------------------------------------------------------
> > *From:* Alex Deucher <[email protected]>
> > *Sent:* Wednesday, April 13, 2022 10:18 AM
> > *To:* Zhang, Dingchen (David) <[email protected]>
> > *Cc:* Stephen Rothwell <[email protected]>; Kotarac, Pavle
> > <[email protected]>; Chung, ChiaHsuan (Tom)
> > <[email protected]>; Linux Kernel Mailing List
> > <[email protected]>; Linux Next Mailing List
> > <[email protected]>
> > *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
> > The patch should be there now.
> >
> > Alex
> >
> > On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
> > <[email protected]> wrote:
> >>
> >> [AMD Official Use Only]
> >>
> >>
> >> hi Stephen,
> >>
> >> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
> >>
> >> ~~~~
> >> eb2bb029bacf David Zhang 12 days ago drm: add PSR2 support and capability definition as per eDP 1.5
> >> ~~~~~
> >>
> >> Thanks
> >> David
> >> ________________________________ From: Stephen Rothwell
> >> Sent: Tuesday, April 12, 2022 10:32 PM
> >> To: Alex Deucher
> >> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
> >> Subject: linux-next: build failure after merge of the amdgpu tree
> >>
> >> Hi all,
> >>
> >> After merging the amdgpu tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
> >> 798 | if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
> >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> | DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
> >>
> >> Caused by commit
> >>
> >> 901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
> >>
> >> Please start including an x86_64 allmodconfig build in your local testing.
> >>
> >> I have used the amdgpu tree from next-20220412 for today.
> >>
> >> --
> >> Cheers,
> >> Stephen Rothwell
>

2022-04-16 01:48:46

by Rodrigo Siqueira Jordao

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

Hi Alex,

Do we need to apply David's patch [1] to drm-misc-next? If so, I can
merge it there. Also, I noticed that drm-misc-next changed the dp header
path; in that way, I had to change the original patch a little bit.

1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1

Best Regards,
Siqueira

On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
> [AMD Official Use Only]
>
>
> Thanks for clarifying, Alex.
> ------------------------------------------------------------------------
> *From:* Alex Deucher <[email protected]>
> *Sent:* Wednesday, April 13, 2022 10:18 AM
> *To:* Zhang, Dingchen (David) <[email protected]>
> *Cc:* Stephen Rothwell <[email protected]>; Kotarac, Pavle
> <[email protected]>; Chung, ChiaHsuan (Tom)
> <[email protected]>; Linux Kernel Mailing List
> <[email protected]>; Linux Next Mailing List
> <[email protected]>
> *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
> The patch should be there now.
>
> Alex
>
> On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
> <[email protected]> wrote:
>>
>> [AMD Official Use Only]
>>
>>
>> hi Stephen,
>>
>> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>>
>> ~~~~
>> eb2bb029bacf David Zhang         12 days ago    drm: add PSR2 support and capability definition as per eDP 1.5
>> ~~~~~
>>
>> Thanks
>> David
>> ________________________________ From: Stephen Rothwell
>> Sent: Tuesday, April 12, 2022 10:32 PM
>> To: Alex Deucher
>> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
>> Subject: linux-next: build failure after merge of the amdgpu tree
>>
>> Hi all,
>>
>> After merging the amdgpu tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
>>   798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
>>       |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>       |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Caused by commit
>>
>>   901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>>
>> Please start including an x86_64 allmodconfig build in your local testing.
>>
>> I have used the amdgpu tree from next-20220412 for today.
>>
>> --
>> Cheers,
>> Stephen Rothwell

2022-05-06 09:27:04

by Nathan Chancellor

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

Hi Stephen,

On Thu, May 05, 2022 at 07:47:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>

<snip long error message>

>
> Caused by commit
>
> 028c3fb37e70 ("drm/amdgpu/mes11: initiate mes v11 support")
>
> This build has __BIG_ENDIAN set.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <[email protected]>
> Date: Thu, 5 May 2022 19:14:25 +1000
> Subject: [PATCH] mark CONFIG_DRM_AMDGPU as depending on CONFIG_CPU_LITTLE_ENDIAN
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> drivers/gpu/drm/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index e88c497fa010..2aaa9ef1168d 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -244,6 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
> config DRM_AMDGPU
> tristate "AMD GPU"
> depends on DRM && PCI && MMU
> + depends on CPU_LITTLE_ENDIAN
> select FW_LOADER
> select DRM_DISPLAY_DP_HELPER
> select DRM_DISPLAY_HDMI_HELPER
> --
> 2.35.1

This fixup makes CONFIG_DRM_AMDGPU unselectable on any architecture that
does not have CONFIG_CPU_LITTLE_ENDIAN, such as x86_64. I was rather
surprised when my AMD test system did not reach the login screen and
there were no error messages in dmesg, only to find that
CONFIG_DRM_AMDGPU had disappeared from my build.

If this is not fixed by the time you do next-20220506, would you
consider swapping the logic like so? This should allow all implicitly
little endian architectures to work (at least, I tested it with x86_64),
while preventing errors for CONFIG_CPU_BIG_ENDIAN configurations.

Cheers,
Nathan

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2aaa9ef1168d..a57843733a96 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -244,7 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
config DRM_AMDGPU
tristate "AMD GPU"
depends on DRM && PCI && MMU
- depends on CPU_LITTLE_ENDIAN
+ depends on !CPU_BIG_ENDIAN
select FW_LOADER
select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDMI_HELPER

2022-05-09 07:21:46

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

On Thu, May 5, 2022 at 2:12 PM Nathan Chancellor <[email protected]> wrote:
>
> Hi Stephen,
>
> On Thu, May 05, 2022 at 07:47:17PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
>
> <snip long error message>
>
> >
> > Caused by commit
> >
> > 028c3fb37e70 ("drm/amdgpu/mes11: initiate mes v11 support")
> >
> > This build has __BIG_ENDIAN set.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <[email protected]>
> > Date: Thu, 5 May 2022 19:14:25 +1000
> > Subject: [PATCH] mark CONFIG_DRM_AMDGPU as depending on CONFIG_CPU_LITTLE_ENDIAN
> >
> > Signed-off-by: Stephen Rothwell <[email protected]>
> > ---
> > drivers/gpu/drm/Kconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> > index e88c497fa010..2aaa9ef1168d 100644
> > --- a/drivers/gpu/drm/Kconfig
> > +++ b/drivers/gpu/drm/Kconfig
> > @@ -244,6 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
> > config DRM_AMDGPU
> > tristate "AMD GPU"
> > depends on DRM && PCI && MMU
> > + depends on CPU_LITTLE_ENDIAN
> > select FW_LOADER
> > select DRM_DISPLAY_DP_HELPER
> > select DRM_DISPLAY_HDMI_HELPER
> > --
> > 2.35.1
>
> This fixup makes CONFIG_DRM_AMDGPU unselectable on any architecture that
> does not have CONFIG_CPU_LITTLE_ENDIAN, such as x86_64. I was rather
> surprised when my AMD test system did not reach the login screen and
> there were no error messages in dmesg, only to find that
> CONFIG_DRM_AMDGPU had disappeared from my build.
>
> If this is not fixed by the time you do next-20220506, would you
> consider swapping the logic like so? This should allow all implicitly
> little endian architectures to work (at least, I tested it with x86_64),
> while preventing errors for CONFIG_CPU_BIG_ENDIAN configurations.

This is fixed. Will push out a new branch shortly.

Alex

>
> Cheers,
> Nathan
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 2aaa9ef1168d..a57843733a96 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -244,7 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
> config DRM_AMDGPU
> tristate "AMD GPU"
> depends on DRM && PCI && MMU
> - depends on CPU_LITTLE_ENDIAN
> + depends on !CPU_BIG_ENDIAN
> select FW_LOADER
> select DRM_DISPLAY_DP_HELPER
> select DRM_DISPLAY_HDMI_HELPER