2022-07-26 11:34:54

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Hi all,

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

ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o

I have reverted commit

c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")

for today.

I suspect that commit

3876a8b5e241 ("drm/amd/display: Enable building new display engine with KCOV enabled")

may also be involved (or, at least, not sufficient).
--
Cheers,
Stephen Rothwell


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

2022-07-27 01:52:36

by Michael Ellerman

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Stephen Rothwell <[email protected]> writes:
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
> ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o

What compiler are you using?

cheers

2022-07-27 05:53:06

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Hi Michael,

On Wed, 27 Jul 2022 11:29:02 +1000 Michael Ellerman <[email protected]> wrote:
>
> Stephen Rothwell <[email protected]> writes:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
> > ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o
>
> What compiler are you using?

Debian's gcc v11.2:

$ gcc --version
gcc (Debian 11.2.0-10) 11.2.0
$ ld --version
GNU ld (GNU Binutils for Debian) 2.37

--
Cheers,
Stephen Rothwell


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

2022-07-27 14:54:41

by Michael Ellerman

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Stephen Rothwell <[email protected]> writes:
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
> ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o
>
> I have reverted commit
>
> c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")
>
> for today.

It bisects to:

40b31e5355ba ("drm/amd/display: Remove FPU flags from DCN30 Makefile")

So I guess there's still some float code in dcn30?

cheers

2022-07-27 16:18:49

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

+ Rodrigo, Melissa

On Wed, Jul 27, 2022 at 10:17 AM Michael Ellerman <[email protected]> wrote:
>
> Stephen Rothwell <[email protected]> writes:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
> > ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o
> >
> > I have reverted commit
> >
> > c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")
> >
> > for today.
>
> It bisects to:
>
> 40b31e5355ba ("drm/amd/display: Remove FPU flags from DCN30 Makefile")
>
> So I guess there's still some float code in dcn30?
>
> cheers

2022-07-28 02:25:26

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Hi all,

On Thu, 28 Jul 2022 00:17:49 +1000 Michael Ellerman <[email protected]> wrote:
>
> Stephen Rothwell <[email protected]> writes:
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
> > ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o
> >
> > I have reverted commit
> >
> > c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")
> >
> > for today.
>
> It bisects to:
>
> 40b31e5355ba ("drm/amd/display: Remove FPU flags from DCN30 Makefile")
>
> So I guess there's still some float code in dcn30?

I have reverted commit 40b31e5355ba from the merge of the drm tree today (since
it has been merged in there) instead of commit c653c591789b.

--
Cheers,
Stephen Rothwell


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

2022-07-28 20:38:57

by Rodrigo Siqueira Jordao

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Hi Stephen/Michael,

I made this fix:

https://patchwork.freedesktop.org/series/106824/

Could you check if it fixes the issue for you? If so, could you undo
your revert?

Thanks
Siqueira

On 2022-07-27 12:15, Alex Deucher wrote:
> + Rodrigo, Melissa
>
> On Wed, Jul 27, 2022 at 10:17 AM Michael Ellerman <[email protected]> wrote:
>>
>> Stephen Rothwell <[email protected]> writes:
>>> Hi all,
>>>
>>> After merging the amdgpu tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> ld: drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.o uses hard float, drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o uses soft float
>>> ld: failed to merge target specific data of file drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.o
>>>
>>> I have reverted commit
>>>
>>> c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")
>>>
>>> for today.
>>
>> It bisects to:
>>
>> 40b31e5355ba ("drm/amd/display: Remove FPU flags from DCN30 Makefile")
>>
>> So I guess there's still some float code in dcn30?
>>
>> cheers

2022-07-28 23:24:15

by Michael Ellerman

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu and powerpc-fixes trees

Rodrigo Siqueira Jordao <[email protected]> writes:
> Hi Stephen/Michael,
>
> I made this fix:
>
> https://patchwork.freedesktop.org/series/106824/
>
> Could you check if it fixes the issue for you?

Thanks that fixes it here.

> If so, could you undo your revert?

Stephen is on vacation and not doing linux-next today, so I guess for
testing you'll have to do a local revert.

cheers