* linux-next: build failure after merge of the drm-misc tree
@ 2025-05-28 3:42 Stephen Rothwell
2025-05-28 7:17 ` Damon Ding
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2025-05-28 3:42 UTC (permalink / raw)
To: Simona Vetter
Cc: Damon Ding, Dmitry Baryshkov, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
1589 | goto err_disable_clk;
| ^~~~
Caused by commit
6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")
I have used the drm-misc tree from next-20250527 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-05-28 3:42 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
@ 2025-05-28 7:17 ` Damon Ding
2025-05-28 8:27 ` Heiko Stübner
0 siblings, 1 reply; 241+ messages in thread
From: Damon Ding @ 2025-05-28 7:17 UTC (permalink / raw)
To: Stephen Rothwell, Simona Vetter
Cc: Dmitry Baryshkov, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Stephen,
On 2025/5/28 11:42, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
> 1589 | goto err_disable_clk;
> | ^~~~
>
> Caused by commit
>
> 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")
>
> I have used the drm-misc tree from next-20250527 for today.
>
Oh, I have found the same compile error after rebasing.
I have removed the 'err_disable_clk' flag and made it return
ERR_PTR(ret) in:
https://lore.kernel.org/all/20250310104114.2608063-7-damon.ding@rock-chips.com/
Likely a small merge conflict bug. Will patch it later. ;-)
Best regards,
Damon
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-05-28 7:17 ` Damon Ding
@ 2025-05-28 8:27 ` Heiko Stübner
0 siblings, 0 replies; 241+ messages in thread
From: Heiko Stübner @ 2025-05-28 8:27 UTC (permalink / raw)
To: Stephen Rothwell, Simona Vetter, dri-devel
Cc: Dmitry Baryshkov, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Damon Ding
Hi,
Am Mittwoch, 28. Mai 2025, 09:17:13 Mitteleuropäische Sommerzeit schrieb Damon Ding:
> On 2025/5/28 11:42, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
> > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
> > 1589 | goto err_disable_clk;
> > | ^~~~
> >
> > Caused by commit
> >
> > 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")
> >
> > I have used the drm-misc tree from next-20250527 for today.
> >
>
> Oh, I have found the same compile error after rebasing.
>
> I have removed the 'err_disable_clk' flag and made it return
> ERR_PTR(ret) in:
> https://lore.kernel.org/all/20250310104114.2608063-7-damon.ding@rock-chips.com/
>
> Likely a small merge conflict bug. Will patch it later. ;-)
I have sent in a patch for that issue yesterday, in
https://lore.kernel.org/dri-devel/20250527225120.3361663-1-heiko@sntech.de/
Heiko
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-09-23 13:25 Mark Brown
2026-09-23 13:45 ` Alex Deucher
2026-09-23 14:01 ` Jani Nikula
0 siblings, 2 replies; 241+ messages in thread
From: Mark Brown @ 2026-09-23 13:25 UTC (permalink / raw)
To: Thomas Zimmermann, David Airlie, Alex Deucher, Simona Vetter,
Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_memory_pool.c:87:37: error: stack frame size (8264) exceeds limit (2048) in 'dc_memory_pool_create' [-Werror,-Wframe-larger-than]
87 | __must_check struct dc_memory_pool *dc_memory_pool_create(size_t size,
|
which I am exceptionally frustrated to see was caused by commit
bc3f07516a992 (Merge drm/drm-next into drm-misc-next)
which merged the bug I originally reported in the amdgpu tree:
https://lore.kernel.org/r/aq0vYhZXtMqA41wZ@sirena.org.uk
and then in the drm tree when that was sent upstream without the report
having been addressed in any way:
https://lore.kernel.org/r/arJoCiRM1hRbgRb5@sirena.co.uk
neither of which have had any response at all. It really seems like
there is some room for improvement in your processes here, currently
that's three drm trees all held out of -next with the same fairly simple
build issue. Can I suggest at least check to see if the code you are
trying to merge is in -next, the drm merge was done after amdgpu had
been held out of -next for several days.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-23 13:25 Mark Brown
@ 2026-09-23 13:45 ` Alex Deucher
2026-09-23 14:26 ` Mark Brown
2026-09-23 14:01 ` Jani Nikula
1 sibling, 1 reply; 241+ messages in thread
From: Alex Deucher @ 2026-09-23 13:45 UTC (permalink / raw)
To: Mark Brown
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Sep 23, 2026 at 9:25 AM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_memory_pool.c:87:37: error: stack frame size (8264) exceeds limit (2048) in 'dc_memory_pool_create' [-Werror,-Wframe-larger-than]
> 87 | __must_check struct dc_memory_pool *dc_memory_pool_create(size_t size,
> |
>
> which I am exceptionally frustrated to see was caused by commit
>
> bc3f07516a992 (Merge drm/drm-next into drm-misc-next)
>
> which merged the bug I originally reported in the amdgpu tree:
>
> https://lore.kernel.org/r/aq0vYhZXtMqA41wZ@sirena.org.uk
>
> and then in the drm tree when that was sent upstream without the report
> having been addressed in any way:
>
> https://lore.kernel.org/r/arJoCiRM1hRbgRb5@sirena.co.uk
>
> neither of which have had any response at all. It really seems like
> there is some room for improvement in your processes here, currently
> that's three drm trees all held out of -next with the same fairly simple
> build issue. Can I suggest at least check to see if the code you are
> trying to merge is in -next, the drm merge was done after amdgpu had
> been held out of -next for several days.
I sent the PR out on Thursday and you reported the issue on Friday,
then the weekend happened. It was investigated and fixed, however
Dave reported a different stack frame warning yesterday so we are
trying to make sure that is resolved as well. In addition we've been
trying to figure out why our clang builds did not catch it in the
first place. All the patches should be available momentarily.
Alex
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-23 13:45 ` Alex Deucher
@ 2026-09-23 14:26 ` Mark Brown
2026-09-23 21:57 ` Alex Deucher
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-23 14:26 UTC (permalink / raw)
To: Alex Deucher
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1824 bytes --]
On Wed, Sep 23, 2026 at 09:45:38AM -0400, Alex Deucher wrote:
> On Wed, Sep 23, 2026 at 9:25 AM Mark Brown <broonie@kernel.org> wrote:
> > neither of which have had any response at all. It really seems like
> > there is some room for improvement in your processes here, currently
> > that's three drm trees all held out of -next with the same fairly simple
> > build issue. Can I suggest at least check to see if the code you are
> > trying to merge is in -next, the drm merge was done after amdgpu had
> > been held out of -next for several days.
> I sent the PR out on Thursday and you reported the issue on Friday,
> then the weekend happened. It was investigated and fixed, however
The actual merge still didn't happen until after I'd reported the issue,
and then as ever things are now starting to propagate through the other
drm trees. It seems fairly obvious that there is room for improvement
here, for example people could check that the code they're merging has
at least made it into -next.
> Dave reported a different stack frame warning yesterday so we are
> trying to make sure that is resolved as well. In addition we've been
> trying to figure out why our clang builds did not catch it in the
> first place. All the patches should be available momentarily.
OK, that sounds more promising than what had been visible to me. It
would be helpful if you could be more communicative regarding these
issues, the drm trees and over the past couple of releases especially
the amdgpu tree take substantially more of my time than the rest of
-next. Between the frequency of the issues, the length of time they
persist, the way your process will obviously trigger such issues and the
near total lack of response to my reports it really never feels like
that time is valued.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-23 14:26 ` Mark Brown
@ 2026-09-23 21:57 ` Alex Deucher
2026-09-24 16:54 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Alex Deucher @ 2026-09-23 21:57 UTC (permalink / raw)
To: Mark Brown
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Sep 23, 2026 at 10:27 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Wed, Sep 23, 2026 at 09:45:38AM -0400, Alex Deucher wrote:
> > On Wed, Sep 23, 2026 at 9:25 AM Mark Brown <broonie@kernel.org> wrote:
>
> > > neither of which have had any response at all. It really seems like
> > > there is some room for improvement in your processes here, currently
> > > that's three drm trees all held out of -next with the same fairly simple
> > > build issue. Can I suggest at least check to see if the code you are
> > > trying to merge is in -next, the drm merge was done after amdgpu had
> > > been held out of -next for several days.
>
> > I sent the PR out on Thursday and you reported the issue on Friday,
> > then the weekend happened. It was investigated and fixed, however
>
> The actual merge still didn't happen until after I'd reported the issue,
> and then as ever things are now starting to propagate through the other
> drm trees. It seems fairly obvious that there is room for improvement
> here, for example people could check that the code they're merging has
> at least made it into -next.
>
> > Dave reported a different stack frame warning yesterday so we are
> > trying to make sure that is resolved as well. In addition we've been
> > trying to figure out why our clang builds did not catch it in the
> > first place. All the patches should be available momentarily.
>
> OK, that sounds more promising than what had been visible to me. It
> would be helpful if you could be more communicative regarding these
> issues, the drm trees and over the past couple of releases especially
> the amdgpu tree take substantially more of my time than the rest of
> -next. Between the frequency of the issues, the length of time they
> persist, the way your process will obviously trigger such issues and the
> near total lack of response to my reports it really never feels like
> that time is valued.
Your reports are valuable and we always take them seriously even if I
don't reply as quickly as I should. For the issues at hand they
should all be fixed with the following patches:
https://patchwork.freedesktop.org/patch/755725/?series=174828&rev=1
https://patchwork.freedesktop.org/patch/755741/?series=174834&rev=1
https://patchwork.freedesktop.org/patch/755769/?series=172614&rev=2
I'll push a new -next branch with those fixes later today.
Alex
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-23 21:57 ` Alex Deucher
@ 2026-09-24 16:54 ` Mark Brown
2026-09-24 17:01 ` Alex Deucher
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-24 16:54 UTC (permalink / raw)
To: Alex Deucher
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3522 bytes --]
On Wed, Sep 23, 2026 at 05:57:24PM -0400, Alex Deucher wrote:
> Your reports are valuable and we always take them seriously even if I
> don't reply as quickly as I should. For the issues at hand they
> should all be fixed with the following patches:
> https://patchwork.freedesktop.org/patch/755725/?series=174828&rev=1
> https://patchwork.freedesktop.org/patch/755741/?series=174834&rev=1
> https://patchwork.freedesktop.org/patch/755769/?series=172614&rev=2
> I'll push a new -next branch with those fixes later today.
I'm still seeing at least:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c: In function ‘UseMinimumDCFCLK’:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c:6666:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
6666 | }
| ^
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c: In function ‘UseMinimumDCFCLK’:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:7460:1: error: the frame size of 2128 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
7460 | }
| ^
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c: In function ‘dml32_UseMinimumDCFCLK’:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c:3278:1: error: the frame size of 2176 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
3278 | }
| ^
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_mode_vba_314.c: In function ‘UseMinimumDCFCLK’:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_mode_vba_314.c:7546:1: error: the frame size of 2128 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
7546 | }
| ^
cc1: all warnings being treated as errors
make[7]: *** [/home/broonie/git/next/sfr/next/scripts/Makefile.build:290: drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.o] Error 1
make[7]: *** Waiting for unfinished jobs....
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml2_0/display_mode_core.c: In function ‘dml_prefetch_check’:
/home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml2_0/display_mode_core.c:6821:1: error: the frame size of 2160 bytes is larger than 2056 bytes [-Werror=frame-larger-than=]
6821 | }
| ^
after merging amdgpu today, note that this is in the -next merge and not
just the amdgpu tree in isolation. I am currently holding drm and
drm-misc at next-20260921, there is a conflict with the old version of
them though that was just comments but they'll be in the history at the
point I'm building so possibly whatever git did with the merge is
causing issues.
Any fixes will also need to propagate into drm and drm-misc.
I'm also still carrying a build fix marking the display KUnit tests as
BROKEN due to the issues with the conflicting changes with drm-misc
which several people have noticed, for example there's this from Arnd
last week:
https://lore.kernel.org/r/20260915201006.3526945-1-arnd@kernel.org
None of the mails I saw about that or the issues resulting from my
mismerge got any response either.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-24 16:54 ` Mark Brown
@ 2026-09-24 17:01 ` Alex Deucher
2026-09-24 17:16 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Alex Deucher @ 2026-09-24 17:01 UTC (permalink / raw)
To: Mark Brown
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
On Thu, Sep 24, 2026 at 12:54 PM Mark Brown <broonie@kernel.org> wrote:
>
> On Wed, Sep 23, 2026 at 05:57:24PM -0400, Alex Deucher wrote:
>
> > Your reports are valuable and we always take them seriously even if I
> > don't reply as quickly as I should. For the issues at hand they
> > should all be fixed with the following patches:
>
> > https://patchwork.freedesktop.org/patch/755725/?series=174828&rev=1
> > https://patchwork.freedesktop.org/patch/755741/?series=174834&rev=1
> > https://patchwork.freedesktop.org/patch/755769/?series=172614&rev=2
>
> > I'll push a new -next branch with those fixes later today.
>
> I'm still seeing at least:
>
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c: In function ‘UseMinimumDCFCLK’:
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c:6666:1: error: the frame size of 2064 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 6666 | }
> | ^
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c: In function ‘UseMinimumDCFCLK’:
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:7460:1: error: the frame size of 2128 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 7460 | }
> | ^
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c: In function ‘dml32_UseMinimumDCFCLK’:
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.c:3278:1: error: the frame size of 2176 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 3278 | }
> | ^
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_mode_vba_314.c: In function ‘UseMinimumDCFCLK’:
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_mode_vba_314.c:7546:1: error: the frame size of 2128 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 7546 | }
> | ^
> cc1: all warnings being treated as errors
> make[7]: *** [/home/broonie/git/next/sfr/next/scripts/Makefile.build:290: drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_util_32.o] Error 1
> make[7]: *** Waiting for unfinished jobs....
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml2_0/display_mode_core.c: In function ‘dml_prefetch_check’:
> /home/broonie/git/next/sfr/next/drivers/gpu/drm/amd/amdgpu/../display/dc/dml2_0/display_mode_core.c:6821:1: error: the frame size of 2160 bytes is larger than 2056 bytes [-Werror=frame-larger-than=]
> 6821 | }
> | ^
Does this patch fix it?
https://patchwork.freedesktop.org/patch/755883/?series=174861&rev=1
Alex
>
> after merging amdgpu today, note that this is in the -next merge and not
> just the amdgpu tree in isolation. I am currently holding drm and
> drm-misc at next-20260921, there is a conflict with the old version of
> them though that was just comments but they'll be in the history at the
> point I'm building so possibly whatever git did with the merge is
> causing issues.
>
> Any fixes will also need to propagate into drm and drm-misc.>
> I'm also still carrying a build fix marking the display KUnit tests as
> BROKEN due to the issues with the conflicting changes with drm-misc
> which several people have noticed, for example there's this from Arnd
> last week:
>
> https://lore.kernel.org/r/20260915201006.3526945-1-arnd@kernel.org
>
> None of the mails I saw about that or the issues resulting from my
> mismerge got any response either.
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-24 17:01 ` Alex Deucher
@ 2026-09-24 17:16 ` Mark Brown
0 siblings, 0 replies; 241+ messages in thread
From: Mark Brown @ 2026-09-24 17:16 UTC (permalink / raw)
To: Alex Deucher
Cc: Thomas Zimmermann, David Airlie, Simona Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
On Thu, Sep 24, 2026 at 01:01:15PM -0400, Alex Deucher wrote:
> On Thu, Sep 24, 2026 at 12:54 PM Mark Brown <broonie@kernel.org> wrote:
> > I'm still seeing at least:
> Does this patch fix it?
> https://patchwork.freedesktop.org/patch/755883/?series=174861&rev=1
I don't have the tree any more since I'm further into -next but I'd
expect so, thanks.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-23 13:25 Mark Brown
2026-09-23 13:45 ` Alex Deucher
@ 2026-09-23 14:01 ` Jani Nikula
1 sibling, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2026-09-23 14:01 UTC (permalink / raw)
To: Mark Brown, Thomas Zimmermann, David Airlie, Alex Deucher,
Simona Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Wed, 23 Sep 2026, Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_memory_pool.c:87:37: error: stack frame size (8264) exceeds limit (2048) in 'dc_memory_pool_create' [-Werror,-Wframe-larger-than]
> 87 | __must_check struct dc_memory_pool *dc_memory_pool_create(size_t size,
> |
>
> which I am exceptionally frustrated to see was caused by commit
>
> bc3f07516a992 (Merge drm/drm-next into drm-misc-next)
>
> which merged the bug I originally reported in the amdgpu tree:
>
> https://lore.kernel.org/r/aq0vYhZXtMqA41wZ@sirena.org.uk
>
> and then in the drm tree when that was sent upstream without the report
> having been addressed in any way:
>
> https://lore.kernel.org/r/arJoCiRM1hRbgRb5@sirena.co.uk
>
> neither of which have had any response at all. It really seems like
> there is some room for improvement in your processes here, currently
> that's three drm trees all held out of -next with the same fairly simple
> build issue. Can I suggest at least check to see if the code you are
> trying to merge is in -next, the drm merge was done after amdgpu had
> been held out of -next for several days.
I don't really have a skin in the game, but it all builds fine for me. I
have CONFIG_FRAME_WARN=2048.
I presume the problem is the compound literal in
dc_memory_pool_create():
*pool = (struct dc_memory_pool){
.size = size,
.capacity = capacity,
.unaligned_pool = unaligned_pool,
.unaligned_memory = kcalloc(lines + 1, PAGE_SIZE, GFP_KERNEL),
.free_list = kcalloc((uint32_t)capacity, sizeof(atomic_t),
GFP_KERNEL),
.free_head = ATOMIC_INIT(0),
};
sizeof(struct dc_memory_pool) == 2 * PAGE_SIZE, so it's clearly not to
be stored on stack. However, I think it's up to the compiler whether it
actually holds all of that on stack or not. It could just generate the
equivalent code instead.
BR,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-09-08 14:01 Mark Brown
2026-09-08 14:06 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-08 14:01 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Alex Huang, Mario Limonciello
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: modpost: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_connector_test.ko: symbol 'parse_hdmi_amd_vsdb' undefined!
Caused by commit
65198b3d0738 (drm/amd/display: Use HDMI FreeSync range from common EDID parser)
I have continued to use the version from next-20260831 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-08 14:01 Mark Brown
@ 2026-09-08 14:06 ` Mark Brown
2026-09-08 15:15 ` Alex Deucher
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-08 14:06 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Alex Huang, Mario Limonciello
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
On Tue, Sep 08, 2026 at 03:01:50PM +0100, Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: modpost: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_connector_test.ko: symbol 'parse_hdmi_amd_vsdb' undefined!
>
> Caused by commit
>
> 65198b3d0738 (drm/amd/display: Use HDMI FreeSync range from common EDID parser)
Sorry, that should be f65198b3d07389afdcb48e4ad00fea2aded95dfd.
> I have continued to use the version from next-20260831 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-08 14:06 ` Mark Brown
@ 2026-09-08 15:15 ` Alex Deucher
2026-09-08 15:22 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Alex Deucher @ 2026-09-08 15:15 UTC (permalink / raw)
To: Mark Brown
Cc: Simona Vetter, Intel Graphics, DRI, Alex Huang,
Mario Limonciello, Linux Kernel Mailing List,
Linux Next Mailing List
On Tue, Sep 8, 2026 at 10:07 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Tue, Sep 08, 2026 at 03:01:50PM +0100, Mark Brown wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > ERROR: modpost: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/tests/amdgpu_dm_connector_test.ko: symbol 'parse_hdmi_amd_vsdb' undefined!
> >
> > Caused by commit
> >
> > 65198b3d0738 (drm/amd/display: Use HDMI FreeSync range from common EDID parser)
>
> Sorry, that should be f65198b3d07389afdcb48e4ad00fea2aded95dfd.
>
> > I have continued to use the version from next-20260831 instead.
>
Fixed here:
https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/730c6d8072d8d9a6dbfd06c7c5ab4479167a792a
Alex
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-08 15:15 ` Alex Deucher
@ 2026-09-08 15:22 ` Mark Brown
0 siblings, 0 replies; 241+ messages in thread
From: Mark Brown @ 2026-09-08 15:22 UTC (permalink / raw)
To: Alex Deucher
Cc: Simona Vetter, Intel Graphics, DRI, Alex Huang,
Mario Limonciello, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
On Tue, Sep 08, 2026 at 11:15:36AM -0400, Alex Deucher wrote:
> On Tue, Sep 8, 2026 at 10:07 AM Mark Brown <broonie@kernel.org> wrote:
> > > Caused by commit
> > > 65198b3d0738 (drm/amd/display: Use HDMI FreeSync range from common EDID parser)
> > Sorry, that should be f65198b3d07389afdcb48e4ad00fea2aded95dfd.
> > > I have continued to use the version from next-20260831 instead.
> Fixed here:
> https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/730c6d8072d8d9a6dbfd06c7c5ab4479167a792a
Thanks for getting on top of this so quickly. This also suggests that
there's some issues with the setup of your KUnit tests and those of drm
in general, kunit is run as part of the coverage for -next and didn't
trip up. --alltests is enabled so everything coverable should be being
covered but I see a distinct lack of any DRM stuff getting run.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-09-01 14:05 Mark Brown
2026-09-02 6:52 ` Ivaylo Dimitrov
2026-09-07 14:01 ` Mark Brown
0 siblings, 2 replies; 241+ messages in thread
From: Mark Brown @ 2026-09-01 14:05 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Ivaylo Dimitrov,
Tomi Valkeinen, Jarkko Nikula
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
408 | ad->card = card;
| ~~ ^
Caused by commit
699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI codec)
I have used the tree from next-20260831 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-01 14:05 Mark Brown
@ 2026-09-02 6:52 ` Ivaylo Dimitrov
2026-09-02 12:11 ` Mark Brown
2026-09-07 14:01 ` Mark Brown
1 sibling, 1 reply; 241+ messages in thread
From: Ivaylo Dimitrov @ 2026-09-02 6:52 UTC (permalink / raw)
To: Mark Brown, Simona Vetter, Intel Graphics, DRI, Tomi Valkeinen,
Jarkko Nikula
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On 1.09.26 г. 17:05 ч., Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
> 408 | ad->card = card;
> | ~~ ^
>
> Caused by commit
>
> 699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI codec)
>
> I have used the tree from next-20260831 instead.
This seems to be due to an interaction between two patches:
1. 9af2c1d4f847 (ASoC: ti: omap-hdmi: remove unused *card) /
875e906efdc4 (ASoC: ti: preparation for Card capsuling)
2. 699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI
codec)
Both (1) patches are in the tree and remove the 'card' member from
struct hdmi_audio_data, while (2) was already in transit. Patch (2) only
reorders the existing ad->card = card assignment, so it still contains
that reference:
+ ad->card = card;
+
+ snd_soc_card_set_drvdata(card, ad);
ret = devm_snd_soc_register_card(dev, card);
if (ret) {
dev_err(dev, "snd_soc_register_card failed (%d)\n", ret);
return ret;
}
- ad->card = card;
- snd_soc_card_set_drvdata(card, ad);
-
dev_set_drvdata(dev, ad);
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-02 6:52 ` Ivaylo Dimitrov
@ 2026-09-02 12:11 ` Mark Brown
2026-09-02 13:11 ` Tomi Valkeinen
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-02 12:11 UTC (permalink / raw)
To: Ivaylo Dimitrov
Cc: Simona Vetter, Intel Graphics, DRI, Tomi Valkeinen,
Jarkko Nikula, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
On Wed, Sep 02, 2026 at 09:52:24AM +0300, Ivaylo Dimitrov wrote:
> On 1.09.26 г. 17:05 ч., Mark Brown wrote:
> > /tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
> > 408 | ad->card = card;
> > | ~~ ^
> This seems to be due to an interaction between two patches:
> 1. 9af2c1d4f847 (ASoC: ti: omap-hdmi: remove unused *card) / 875e906efdc4
> (ASoC: ti: preparation for Card capsuling)
Those are in -rc1...
> 2. 699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI
> codec)
...which the drm-misc tree has now merged so I don't expect it to build
independently of any other tree. I'm a bit surprised this wasn't caught
when merging up -rc1.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-02 12:11 ` Mark Brown
@ 2026-09-02 13:11 ` Tomi Valkeinen
2026-09-02 14:40 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Tomi Valkeinen @ 2026-09-02 13:11 UTC (permalink / raw)
To: Mark Brown, Ivaylo Dimitrov
Cc: Simona Vetter, Intel Graphics, DRI, Jarkko Nikula,
Linux Kernel Mailing List, Linux Next Mailing List
Hi,
On 02/09/2026 15:11, Mark Brown wrote:
> On Wed, Sep 02, 2026 at 09:52:24AM +0300, Ivaylo Dimitrov wrote:
>> On 1.09.26 г. 17:05 ч., Mark Brown wrote:
>
>>> /tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
>>> 408 | ad->card = card;
>>> | ~~ ^
>
>> This seems to be due to an interaction between two patches:
>> 1. 9af2c1d4f847 (ASoC: ti: omap-hdmi: remove unused *card) / 875e906efdc4
>> (ASoC: ti: preparation for Card capsuling)
>
> Those are in -rc1...
>
>> 2. 699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI
>> codec)
>
> ...which the drm-misc tree has now merged so I don't expect it to build
> independently of any other tree. I'm a bit surprised this wasn't caught
> when merging up -rc1.
So the fix is just to remove that line. Any preference, should this go
via drm or sound?
Tomi
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-02 13:11 ` Tomi Valkeinen
@ 2026-09-02 14:40 ` Mark Brown
0 siblings, 0 replies; 241+ messages in thread
From: Mark Brown @ 2026-09-02 14:40 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Ivaylo Dimitrov, Simona Vetter, Intel Graphics, DRI,
Jarkko Nikula, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
On Wed, Sep 02, 2026 at 04:11:21PM +0300, Tomi Valkeinen wrote:
> On 02/09/2026 15:11, Mark Brown wrote:
> > > 2. 699e5975e2a53 (drm/omap: Report HDMI hotplug events to the ASoC HDMI
> > > codec)
> > ...which the drm-misc tree has now merged so I don't expect it to build
> > independently of any other tree. I'm a bit surprised this wasn't caught
> > when merging up -rc1.
> So the fix is just to remove that line. Any preference, should this go via
> drm or sound?
Given that the breakage is in drm-misc it needs to be fixed in drm-misc,
hopefully before it starts getting cross merged everywhere.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-01 14:05 Mark Brown
2026-09-02 6:52 ` Ivaylo Dimitrov
@ 2026-09-07 14:01 ` Mark Brown
2026-09-07 14:03 ` Tomi Valkeinen
1 sibling, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-07 14:01 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Ivaylo Dimitrov,
Tomi Valkeinen, Jarkko Nikula
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
On Tue, Sep 01, 2026 at 03:05:49PM +0100, Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
> 408 | ad->card = card;
> | ~~ ^
This issue is still present today.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-07 14:01 ` Mark Brown
@ 2026-09-07 14:03 ` Tomi Valkeinen
2026-09-07 14:08 ` Mark Brown
0 siblings, 1 reply; 241+ messages in thread
From: Tomi Valkeinen @ 2026-09-07 14:03 UTC (permalink / raw)
To: Mark Brown, Simona Vetter, Intel Graphics, DRI, Ivaylo Dimitrov,
Jarkko Nikula
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Hi,
On 07/09/2026 17:01, Mark Brown wrote:
> On Tue, Sep 01, 2026 at 03:05:49PM +0100, Mark Brown wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> /tmp/next/build/sound/soc/ti/omap-hdmi.c:408:6: error: no member named 'card' in 'struct hdmi_audio_data'
>> 408 | ad->card = card;
>> | ~~ ^
>
> This issue is still present today.
I have sent "[PATCH] ASoC: ti: omap-hdmi: Fix build error from a merge
commit" (20260903-omap-hdmi-fix-v1-1-b0447a1d35d5@ideasonboard.com).
Waiting for a R-b so I can push it via drm-misc.
Tomi
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-07 14:03 ` Tomi Valkeinen
@ 2026-09-07 14:08 ` Mark Brown
2026-09-08 7:22 ` Tomi Valkeinen
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-09-07 14:08 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Simona Vetter, Intel Graphics, DRI, Ivaylo Dimitrov,
Jarkko Nikula, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
On Mon, Sep 07, 2026 at 05:03:22PM +0300, Tomi Valkeinen wrote:
> On 07/09/2026 17:01, Mark Brown wrote:
> > This issue is still present today.
> I have sent "[PATCH] ASoC: ti: omap-hdmi: Fix build error from a merge
> commit" (20260903-omap-hdmi-fix-v1-1-b0447a1d35d5@ideasonboard.com). Waiting
> for a R-b so I can push it via drm-misc.
I saw that, it is probably worth looking into what's going on with the
process here if what should be a relatively simple build failure fix is
taking this long to get integrated.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2026-09-07 14:08 ` Mark Brown
@ 2026-09-08 7:22 ` Tomi Valkeinen
0 siblings, 0 replies; 241+ messages in thread
From: Tomi Valkeinen @ 2026-09-08 7:22 UTC (permalink / raw)
To: Mark Brown
Cc: Simona Vetter, Intel Graphics, DRI, Ivaylo Dimitrov,
Jarkko Nikula, Linux Kernel Mailing List,
Linux Next Mailing List
Hi,
On 07/09/2026 17:08, Mark Brown wrote:
> On Mon, Sep 07, 2026 at 05:03:22PM +0300, Tomi Valkeinen wrote:
>> On 07/09/2026 17:01, Mark Brown wrote:
>
>>> This issue is still present today.
>
>> I have sent "[PATCH] ASoC: ti: omap-hdmi: Fix build error from a merge
>> commit" (20260903-omap-hdmi-fix-v1-1-b0447a1d35d5@ideasonboard.com). Waiting
>> for a R-b so I can push it via drm-misc.
>
> I saw that, it is probably worth looking into what's going on with the
> process here if what should be a relatively simple build failure fix is
> taking this long to get integrated.
I have pushed 836a0bb73c17 to drm-misc-next.
Tomi
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-07-21 14:06 Mark Brown
2026-07-22 8:44 ` Neil Armstrong
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-07-21 14:06 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Maxime Ripard, Albert Esteve,
Neil Armstrong
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build
(arm64 defconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/imx/dcss/dcss-kms.c: In function 'dcss_kms_bridge_connector_init':
/tmp/next/build/drivers/gpu/drm/imx/dcss/dcss-kms.c:81:17: error: implicit declaration of function 'drm_panel_put'; did you mean 'drm_dev_put'? [-Wimplicit-function-declaration]
81 | drm_panel_put(panel);
| ^~~~~~~~~~~~~
| drm_dev_put
make[8]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/gpu/drm/imx/dcss/dcss-kms.o] Error 1
make[7]: *** [/tmp/next/build/scripts/Makefile.build:549: drivers/gpu/drm/imx/dcss] Error 2
make[6]: *** [/tmp/next/build/scripts/Makefile.build:549: drivers/gpu/drm/imx] Error 2
make[6]: *** Waiting for unfinished jobs....
/tmp/next/build/drivers/gpu/drm/mxsfb/mxsfb_drv.c: In function 'mxsfb_attach_bridge':
/tmp/next/build/drivers/gpu/drm/mxsfb/mxsfb_drv.c:130:17: error: implicit declaration of function 'drm_panel_put'; did you mean 'drm_dev_put'? [-Wimplicit-function-declaration]
130 | drm_panel_put(panel);
| ^~~~~~~~~~~~~
| drm_dev_put
Caused by commit
b71a623598d31 (drm/panel: of_drm_find_panel() return a counted reference)
I have used the version from next-20260720 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-07-21 14:06 Mark Brown
@ 2026-07-22 8:44 ` Neil Armstrong
0 siblings, 0 replies; 241+ messages in thread
From: Neil Armstrong @ 2026-07-22 8:44 UTC (permalink / raw)
To: Mark Brown, Simona Vetter, Intel Graphics, DRI, Maxime Ripard,
Albert Esteve
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Hi Mark,
On 7/21/26 16:06, Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build
> (arm64 defconfig) failed like this:
>
> /tmp/next/build/drivers/gpu/drm/imx/dcss/dcss-kms.c: In function 'dcss_kms_bridge_connector_init':
> /tmp/next/build/drivers/gpu/drm/imx/dcss/dcss-kms.c:81:17: error: implicit declaration of function 'drm_panel_put'; did you mean 'drm_dev_put'? [-Wimplicit-function-declaration]
> 81 | drm_panel_put(panel);
> | ^~~~~~~~~~~~~
> | drm_dev_put
> make[8]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/gpu/drm/imx/dcss/dcss-kms.o] Error 1
> make[7]: *** [/tmp/next/build/scripts/Makefile.build:549: drivers/gpu/drm/imx/dcss] Error 2
> make[6]: *** [/tmp/next/build/scripts/Makefile.build:549: drivers/gpu/drm/imx] Error 2
> make[6]: *** Waiting for unfinished jobs....
> /tmp/next/build/drivers/gpu/drm/mxsfb/mxsfb_drv.c: In function 'mxsfb_attach_bridge':
> /tmp/next/build/drivers/gpu/drm/mxsfb/mxsfb_drv.c:130:17: error: implicit declaration of function 'drm_panel_put'; did you mean 'drm_dev_put'? [-Wimplicit-function-declaration]
> 130 | drm_panel_put(panel);
> | ^~~~~~~~~~~~~
> | drm_dev_put
>
> Caused by commit
>
> b71a623598d31 (drm/panel: of_drm_find_panel() return a counted reference)
>
> I have used the version from next-20260720 instead.
Seems the patch hasn't been properly build tested, I'll send a fix today.
Thanks,
Neil
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-05-25 15:02 Mark Brown
2026-05-25 15:27 ` Icenowy Zheng
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-05-25 15:02 UTC (permalink / raw)
To: Maxime Ripard, Dave Airlie, Icenowy Zheng, Thomas Zimmermann,
Dmitry Baryshkov, Simona Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 10844 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:43:48:
error: 'struct drm_atomic_state' declared inside parameter list will
not be visible outside of this definition or declaration [-Werror]
43 | struct drm_atomic_state *state)
| ^~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
In function 'vs_cursor_plane_atomic_check':
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:45:82:
error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
incompatible pointer type [-Wincompatible-pointer-types]
45 | struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
| ^~~~~
| |
| struct
| drm_atomic_state
| *
In file included from
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:12:
/tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
'const struct drm_atomic_commit *' but argument is of type 'struct
drm_atomic_state *'
824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit *state,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:55:60:
error: passing argument 1 of 'drm_atomic_get_new_crtc_state' from
incompatible pointer type [-Wincompatible-pointer-types]
55 | crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
| ^~~~~
| | struct
| drm_atomic_state
| *
/tmp/next/build/include/drm/drm_atomic.h:794:63: note: expected
'const struct drm_atomic_commit *' but argument is of type 'struct
drm_atomic_state *'
794 | drm_atomic_get_new_crtc_state(const struct drm_atomic_commit *state,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
At top level:
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:101:51:
error: 'struct drm_atomic_state' declared inside parameter list will
not be visible outside of this definition or declaration [-Werror]
101 | struct drm_atomic_state *atomic_state)
| ^~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
In function 'vs_cursor_plane_atomic_enable':
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:103:72:
error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
incompatible pointer type [-Wincompatible-pointer-types]
103 | struct drm_plane_state *state = drm_atomic_get_new_plane_state(atomic_state,
| ^~~~~~~~~~~~
| |
| struct
| drm_atomic_state
| *
/tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
'const struct drm_atomic_commit *' but argument is of type 'struct
drm_atomic_state *'
824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit *state,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
At top level:
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:118:52:
error: 'struct drm_atomic_state' declared inside parameter list will
not be visible outside of this definition or declaration [-Werror]
118 | struct drm_atomic_state *atomic_state)
| ^~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
In function 'vs_cursor_plane_atomic_disable':
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:120:72:
error: passing argument 1 of 'drm_atomic_get_old_plane_state' from
incompatible pointer type [-Wincompatible-pointer-types]
120 | struct drm_plane_state *state = drm_atomic_get_old_plane_state(atomic_state,
| ^~~~~~~~~~~~
| |
| struct
| drm_atomic_state
| *
/tmp/next/build/include/drm/drm_atomic.h:809:64: note: expected
'const struct drm_atomic_commit *' but argument is of type 'struct
drm_atomic_state *'
809 | drm_atomic_get_old_plane_state(const struct drm_atomic_commit *state,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
At top level:
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:135:51:
error: 'struct drm_atomic_state' declared inside parameter list will
not be visible outside of this definition or declaration [-Werror]
135 | struct drm_atomic_state *atomic_state)
| ^~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
In function 'vs_cursor_plane_atomic_update':
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:137:72:
error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
incompatible pointer type [-Wincompatible-pointer-types]
137 | struct drm_plane_state *state = drm_atomic_get_new_plane_state(atomic_state,
| ^~~~~~~~~~~~
| |
| struct
| drm_atomic_state
| *
/tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
'const struct drm_atomic_commit *' but argument is of type 'struct
drm_atomic_state *'
824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit *state,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:147:55:
error: passing argument 2 of 'vs_cursor_plane_atomic_disable' from
incompatible pointer type [-Wincompatible-pointer-types]
147 | vs_cursor_plane_atomic_disable(plane, atomic_state);
| ^~~~~~~~~~~~
| | struct
| drm_atomic_state
| *
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:118:70:
note: expected 'struct drm_atomic_state *' but argument is of type
'struct drm_atomic_state *'
118 | struct drm_atomic_state *atomic_state)
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
At top level:
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:225:27:
error: initialization of 'int (*)(struct drm_plane *, struct
drm_atomic_commit *)' from incompatible pointer type 'int (*)(struct
drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
225 | .atomic_check = vs_cursor_plane_atomic_check,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:225:27:
note: (near initialization for
'vs_cursor_plane_helper_funcs.atomic_check')
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:226:27:
error: initialization of 'void (*)(struct drm_plane *, struct
drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
226 | .atomic_update = vs_cursor_plane_atomic_update,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:226:27:
note: (near initialization for
'vs_cursor_plane_helper_funcs.atomic_update')
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:227:27:
error: initialization of 'void (*)(struct drm_plane *, struct
drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
227 | .atomic_enable = vs_cursor_plane_atomic_enable,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:227:27:
note: (near initialization for
'vs_cursor_plane_helper_funcs.atomic_enable')
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:228:27:
error: initialization of 'void (*)(struct drm_plane *, struct
drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
228 | .atomic_disable = vs_cursor_plane_atomic_disable,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:228:27:
note: (near initialization for
'vs_cursor_plane_helper_funcs.atomic_disable')
Caused by commit
8c4ae21891255 (drm: verisilicon: add support for cursor planes)
interacting with
5164f7e7ff8ec (drm: Rename struct drm_atomic_state to drm_atomic_commit)
which appears to be an ancestor of the verisilicon commit. I have used
the version from next-20260522 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-05-25 15:02 Mark Brown
@ 2026-05-25 15:27 ` Icenowy Zheng
0 siblings, 0 replies; 241+ messages in thread
From: Icenowy Zheng @ 2026-05-25 15:27 UTC (permalink / raw)
To: Mark Brown, Maxime Ripard, Dave Airlie, Thomas Zimmermann,
Dmitry Baryshkov, Simona Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
在 2026-05-25一的 16:02 +0100，Mark Brown写道：
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:43:48:
> error: 'struct drm_atomic_state' declared inside parameter list will
> not be visible outside of this definition or declaration [-Werror]
> 43 | struct
> drm_atomic_state *state)
Oops, I put the patch for too long time that the behavior changed.
I'm going to fix this.
Thanks,
Icenowy
> |
> ^~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> In function 'vs_cursor_plane_atomic_check':
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:45:82:
> error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 45 | struct drm_plane_state *new_plane_state =
> drm_atomic_get_new_plane_state(state,
>
> |
> ^~~~~
>
> |
> |
>
> |
> struct
>
> |
> drm_atomic_state
>
> |
> *
> In file included from
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:12:
> /tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
> 'const struct drm_atomic_commit *' but argument is of type 'struct
> drm_atomic_state *'
> 824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit
> *state,
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:55:60:
> error: passing argument 1 of 'drm_atomic_get_new_crtc_state' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 55 | crtc_state =
> drm_atomic_get_new_crtc_state(state, crtc);
> |
> ^~~~~
> | |
> struct
> |
> drm_atomic_state
> | *
> /tmp/next/build/include/drm/drm_atomic.h:794:63: note: expected
> 'const struct drm_atomic_commit *' but argument is of type 'struct
> drm_atomic_state *'
> 794 | drm_atomic_get_new_crtc_state(const struct drm_atomic_commit
> *state,
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> At top level:
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:101:51:
> error: 'struct drm_atomic_state' declared inside parameter list will
> not be visible outside of this definition or declaration [-Werror]
> 101 | struct
> drm_atomic_state *atomic_state)
> |
> ^~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> In function 'vs_cursor_plane_atomic_enable':
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:103:72:
> error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 103 | struct drm_plane_state *state =
> drm_atomic_get_new_plane_state(atomic_state,
>
> |
> ^~~~~~~~~~~~
>
> |
> |
>
> |
> struct
>
> |
> drm_atomic_state
>
> |
> *
> /tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
> 'const struct drm_atomic_commit *' but argument is of type 'struct
> drm_atomic_state *'
> 824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit
> *state,
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> At top level:
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:118:52:
> error: 'struct drm_atomic_state' declared inside parameter list will
> not be visible outside of this definition or declaration [-Werror]
> 118 | struct
> drm_atomic_state *atomic_state)
> |
> ^~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> In function 'vs_cursor_plane_atomic_disable':
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:120:72:
> error: passing argument 1 of 'drm_atomic_get_old_plane_state' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 120 | struct drm_plane_state *state =
> drm_atomic_get_old_plane_state(atomic_state,
>
> |
> ^~~~~~~~~~~~
>
> |
> |
>
> |
> struct
>
> |
> drm_atomic_state
>
> |
> *
> /tmp/next/build/include/drm/drm_atomic.h:809:64: note: expected
> 'const struct drm_atomic_commit *' but argument is of type 'struct
> drm_atomic_state *'
> 809 | drm_atomic_get_old_plane_state(const struct drm_atomic_commit
> *state,
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> At top level:
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:135:51:
> error: 'struct drm_atomic_state' declared inside parameter list will
> not be visible outside of this definition or declaration [-Werror]
> 135 | struct
> drm_atomic_state *atomic_state)
> |
> ^~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> In function 'vs_cursor_plane_atomic_update':
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:137:72:
> error: passing argument 1 of 'drm_atomic_get_new_plane_state' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 137 | struct drm_plane_state *state =
> drm_atomic_get_new_plane_state(atomic_state,
>
> |
> ^~~~~~~~~~~~
>
> |
> |
>
> |
> struct
>
> |
> drm_atomic_state
>
> |
> *
> /tmp/next/build/include/drm/drm_atomic.h:824:64: note: expected
> 'const struct drm_atomic_commit *' but argument is of type 'struct
> drm_atomic_state *'
> 824 | drm_atomic_get_new_plane_state(const struct drm_atomic_commit
> *state,
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:147:55:
> error: passing argument 2 of 'vs_cursor_plane_atomic_disable' from
> incompatible pointer type [-Wincompatible-pointer-types]
> 147 | vs_cursor_plane_atomic_disable(plane,
> atomic_state);
> |
> ^~~~~~~~~~~~
> | |
> struct
> |
> drm_atomic_state
> | *
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:118:70:
> note: expected 'struct drm_atomic_state *' but argument is of type
> 'struct drm_atomic_state *'
> 118 | struct
> drm_atomic_state *atomic_state)
> |
> ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:
> At top level:
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:225:27:
> error: initialization of 'int (*)(struct drm_plane *, struct
> drm_atomic_commit *)' from incompatible pointer type 'int (*)(struct
> drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-
> types]
> 225 | .atomic_check = vs_cursor_plane_atomic_check,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:225:27:
> note: (near initialization for
> 'vs_cursor_plane_helper_funcs.atomic_check')
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:226:27:
> error: initialization of 'void (*)(struct drm_plane *, struct
> drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
> drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-
> types]
> 226 | .atomic_update = vs_cursor_plane_atomic_update,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:226:27:
> note: (near initialization for
> 'vs_cursor_plane_helper_funcs.atomic_update')
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:227:27:
> error: initialization of 'void (*)(struct drm_plane *, struct
> drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
> drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-
> types]
> 227 | .atomic_enable = vs_cursor_plane_atomic_enable,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:227:27:
> note: (near initialization for
> 'vs_cursor_plane_helper_funcs.atomic_enable')
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:228:27:
> error: initialization of 'void (*)(struct drm_plane *, struct
> drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct
> drm_plane *, struct drm_atomic_state *)' [-Wincompatible-pointer-
> types]
> 228 | .atomic_disable = vs_cursor_plane_atomic_disable,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/gpu/drm/verisilicon/vs_cursor_plane.c:228:27:
> note: (near initialization for
> 'vs_cursor_plane_helper_funcs.atomic_disable')
>
> Caused by commit
>
> 8c4ae21891255 (drm: verisilicon: add support for cursor planes)
>
> interacting with
>
> 5164f7e7ff8ec (drm: Rename struct drm_atomic_state to
> drm_atomic_commit)
>
> which appears to be an ancestor of the verisilicon commit. I have
> used
> the version from next-20260522 instead.
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-02-23 18:56 Mark Brown
0 siblings, 0 replies; 241+ messages in thread
From: Mark Brown @ 2026-02-23 18:56 UTC (permalink / raw)
To: Christian König, Boris Brezillon, Simona Vetter,
Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/i915/selftests/i915_active.c: In function 'active_flush':
/tmp/next/build/drivers/gpu/drm/i915/selftests/i915_active.c:326:28: error: 'struct dma_fence' has no member named 'lock'
326 | spin_lock_irq(fence->lock);
| ^~
/tmp/next/build/drivers/gpu/drm/i915/selftests/i915_active.c:328:30: error: 'struct dma_fence' has no member named 'lock'
328 | spin_unlock_irq(fence->lock); /* serialise with fence->cb_list */
| ^~
Caused by commit
1f32f310a13c9 (dma-buf: inline spinlock for fence protection v5)
I have used the tree from 20260220 instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2026-02-23 18:48 Mark Brown
2026-02-23 19:57 ` Leon Romanovsky
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-02-23 18:48 UTC (permalink / raw)
To: Leon Romanovsky, Jason Gunthorpe, Yishai Hadas, Edward Srouji,
Christian König, Simona Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3755 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~
make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/ib_core_uverbs.o] Error 1
make[6]: *** Waiting for unfinished jobs....
/tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':
/tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~
make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1
Caused by commit
95308225e5bae (dma-buf: Rename dma_buf_move_notify() to dma_buf_invalidate_mappings())
interacting with
0ac6f4056c4a2 (RDMA/uverbs: Add DMABUF object type and operations)
from Linus' tree. I have fixed this up as below and can carry as
needed.
From 89e7d4987e08a46f2db151cebba258a1bc01d628 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Mon, 23 Feb 2026 18:27:51 +0000
Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
/tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
| ^~~~~~~~~~~~~~~~~~~
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/infiniband/core/ib_core_uverbs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/ib_core_uverbs.c b/drivers/infiniband/core/ib_core_uverbs.c
index d3836a62a0049..d6e99c79cf183 100644
--- a/drivers/infiniband/core/ib_core_uverbs.c
+++ b/drivers/infiniband/core/ib_core_uverbs.c
@@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)
dma_resv_lock(uverbs_dmabuf->dmabuf->resv, NULL);
list_del(&uverbs_dmabuf->dmabufs_elm);
uverbs_dmabuf->revoked = true;
- dma_buf_move_notify(uverbs_dmabuf->dmabuf);
+ dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
DMA_RESV_USAGE_BOOKKEEP, false,
MAX_SCHEDULE_TIMEOUT);
diff --git a/drivers/infiniband/core/uverbs_std_types_dmabuf.c b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
index dfdfcd1d1a446..149220a1599cf 100644
--- a/drivers/infiniband/core/uverbs_std_types_dmabuf.c
+++ b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
@@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,
if (!uverbs_dmabuf->revoked) {
uverbs_dmabuf->revoked = true;
list_del(&uverbs_dmabuf->dmabufs_elm);
- dma_buf_move_notify(uverbs_dmabuf->dmabuf);
+ dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
DMA_RESV_USAGE_BOOKKEEP, false,
MAX_SCHEDULE_TIMEOUT);
--
2.47.3
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-02-23 18:48 Mark Brown
@ 2026-02-23 19:57 ` Leon Romanovsky
2026-02-24 9:43 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Leon Romanovsky @ 2026-02-23 19:57 UTC (permalink / raw)
To: Mark Brown
Cc: Jason Gunthorpe, Yishai Hadas, Edward Srouji,
Christian König, Simona Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Feb 23, 2026 at 06:48:46PM +0000, Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
> 249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
> | ^~~~~~~~~~~~~~~~~~~
> make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/ib_core_uverbs.o] Error 1
> make[6]: *** Waiting for unfinished jobs....
> /tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':
> /tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
> 170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
> | ^~~~~~~~~~~~~~~~~~~
> make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1
>
> Caused by commit
>
> 95308225e5bae (dma-buf: Rename dma_buf_move_notify() to dma_buf_invalidate_mappings())
>
> interacting with
>
> 0ac6f4056c4a2 (RDMA/uverbs: Add DMABUF object type and operations)
>
> from Linus' tree. I have fixed this up as below and can carry as
> needed.
>
> From 89e7d4987e08a46f2db151cebba258a1bc01d628 Mon Sep 17 00:00:00 2001
> From: Mark Brown <broonie@kernel.org>
> Date: Mon, 23 Feb 2026 18:27:51 +0000
> Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
>
> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
> 249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
> | ^~~~~~~~~~~~~~~~~~~
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> drivers/infiniband/core/ib_core_uverbs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
The change is correct. The
dma_buf_move_notify->dma_buf_invalidate_mappings rename was merged to
DRM tree before merge window and ib_core_uverbs change was brought
during merge window from RDMA tree.
Christian,
You should take this fix to your tree. RDMA tree doesn't have rename patches
yet.
Thanks
>
> diff --git a/drivers/infiniband/core/ib_core_uverbs.c b/drivers/infiniband/core/ib_core_uverbs.c
> index d3836a62a0049..d6e99c79cf183 100644
> --- a/drivers/infiniband/core/ib_core_uverbs.c
> +++ b/drivers/infiniband/core/ib_core_uverbs.c
> @@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)
> dma_resv_lock(uverbs_dmabuf->dmabuf->resv, NULL);
> list_del(&uverbs_dmabuf->dmabufs_elm);
> uverbs_dmabuf->revoked = true;
> - dma_buf_move_notify(uverbs_dmabuf->dmabuf);
> + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
> dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
> DMA_RESV_USAGE_BOOKKEEP, false,
> MAX_SCHEDULE_TIMEOUT);
> diff --git a/drivers/infiniband/core/uverbs_std_types_dmabuf.c b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
> index dfdfcd1d1a446..149220a1599cf 100644
> --- a/drivers/infiniband/core/uverbs_std_types_dmabuf.c
> +++ b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
> @@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,
> if (!uverbs_dmabuf->revoked) {
> uverbs_dmabuf->revoked = true;
> list_del(&uverbs_dmabuf->dmabufs_elm);
> - dma_buf_move_notify(uverbs_dmabuf->dmabuf);
> + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
> dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
> DMA_RESV_USAGE_BOOKKEEP, false,
> MAX_SCHEDULE_TIMEOUT);
>
> --
> 2.47.3
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-02-23 19:57 ` Leon Romanovsky
@ 2026-02-24 9:43 ` Christian König
0 siblings, 0 replies; 241+ messages in thread
From: Christian König @ 2026-02-24 9:43 UTC (permalink / raw)
To: Leon Romanovsky, Mark Brown
Cc: Jason Gunthorpe, Yishai Hadas, Edward Srouji, Simona Vetter,
Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
On 2/23/26 20:57, Leon Romanovsky wrote:
> On Mon, Feb 23, 2026 at 06:48:46PM +0000, Mark Brown wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
>> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
>> 249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
>> | ^~~~~~~~~~~~~~~~~~~
>> make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/ib_core_uverbs.o] Error 1
>> make[6]: *** Waiting for unfinished jobs....
>> /tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c: In function 'uverbs_dmabuf_fd_destroy_uobj':
>> /tmp/next/build/drivers/infiniband/core/uverbs_std_types_dmabuf.c:170:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
>> 170 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
>> | ^~~~~~~~~~~~~~~~~~~
>> make[6]: *** [/tmp/next/build/scripts/Makefile.build:289: drivers/infiniband/core/uverbs_std_types_dmabuf.o] Error 1
>>
>> Caused by commit
>>
>> 95308225e5bae (dma-buf: Rename dma_buf_move_notify() to dma_buf_invalidate_mappings())
>>
>> interacting with
>>
>> 0ac6f4056c4a2 (RDMA/uverbs: Add DMABUF object type and operations)
>>
>> from Linus' tree. I have fixed this up as below and can carry as
>> needed.
>>
>> From 89e7d4987e08a46f2db151cebba258a1bc01d628 Mon Sep 17 00:00:00 2001
>> From: Mark Brown <broonie@kernel.org>
>> Date: Mon, 23 Feb 2026 18:27:51 +0000
>> Subject: [PATCH] RDMA/uverbs: Update for semantic conflict with drm-misc
>>
>> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c: In function 'rdma_user_mmap_entry_remove':
>> /tmp/next/build/drivers/infiniband/core/ib_core_uverbs.c:249:17: error: implicit declaration of function 'dma_buf_move_notify' [-Wimplicit-function-declaration]
>> 249 | dma_buf_move_notify(uverbs_dmabuf->dmabuf);
>> | ^~~~~~~~~~~~~~~~~~~
>>
>> Signed-off-by: Mark Brown <broonie@kernel.org>
>> ---
>> drivers/infiniband/core/ib_core_uverbs.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> The change is correct. The
> dma_buf_move_notify->dma_buf_invalidate_mappings rename was merged to
> DRM tree before merge window and ib_core_uverbs change was brought
> during merge window from RDMA tree.
>
> Christian,
>
> You should take this fix to your tree. RDMA tree doesn't have rename patches
> yet.
Done.
Regards,
Christian.
>
> Thanks
>
>>
>> diff --git a/drivers/infiniband/core/ib_core_uverbs.c b/drivers/infiniband/core/ib_core_uverbs.c
>> index d3836a62a0049..d6e99c79cf183 100644
>> --- a/drivers/infiniband/core/ib_core_uverbs.c
>> +++ b/drivers/infiniband/core/ib_core_uverbs.c
>> @@ -246,7 +246,7 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry)
>> dma_resv_lock(uverbs_dmabuf->dmabuf->resv, NULL);
>> list_del(&uverbs_dmabuf->dmabufs_elm);
>> uverbs_dmabuf->revoked = true;
>> - dma_buf_move_notify(uverbs_dmabuf->dmabuf);
>> + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
>> dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
>> DMA_RESV_USAGE_BOOKKEEP, false,
>> MAX_SCHEDULE_TIMEOUT);
>> diff --git a/drivers/infiniband/core/uverbs_std_types_dmabuf.c b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
>> index dfdfcd1d1a446..149220a1599cf 100644
>> --- a/drivers/infiniband/core/uverbs_std_types_dmabuf.c
>> +++ b/drivers/infiniband/core/uverbs_std_types_dmabuf.c
>> @@ -167,7 +167,7 @@ static void uverbs_dmabuf_fd_destroy_uobj(struct ib_uobject *uobj,
>> if (!uverbs_dmabuf->revoked) {
>> uverbs_dmabuf->revoked = true;
>> list_del(&uverbs_dmabuf->dmabufs_elm);
>> - dma_buf_move_notify(uverbs_dmabuf->dmabuf);
>> + dma_buf_invalidate_mappings(uverbs_dmabuf->dmabuf);
>> dma_resv_wait_timeout(uverbs_dmabuf->dmabuf->resv,
>> DMA_RESV_USAGE_BOOKKEEP, false,
>> MAX_SCHEDULE_TIMEOUT);
>>
>> --
>> 2.47.3
>>
>
>
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2026-01-19 17:37 Mark Brown
2026-01-19 23:09 ` Dmitry Baryshkov
0 siblings, 1 reply; 241+ messages in thread
From: Mark Brown @ 2026-01-19 17:37 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI, Dmitry Baryshkov
Cc: Thomas Zimmermann, Maxime Ripard, Linux Kernel Mailing List,
Linux Next Mailing List
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c: In function 'drm_test_check_reject_hdr_infoframe_bpc_10':
/tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:2926:49: error: passing argument 6 of 'drm_property_replace_blob_from_id' makes integer from pointer without a cast [-Wint-conversion]
2926 | &replaced);
| ^~~~~~~~~
| |
| bool * {aka _Bool *}
In file included from /tmp/next/build/include/drm/drm_connector.h:33,
from /tmp/next/build/include/drm/drm_modes.h:33,
from /tmp/next/build/include/drm/drm_crtc.h:32,
from /tmp/next/build/include/drm/drm_atomic.h:31,
from /tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:7:
/tmp/next/build/include/drm/drm_property.h:287:47: note: expected 'ssize_t' {aka 'long int'} but argument is of type 'bool *' {aka '_Bool *'}
287 | ssize_t max_size,
| ~~~~~~~~^~~~~~~~
/tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:2922:15: error: too few arguments to function 'drm_property_replace_blob_from_id'
2922 | ret = drm_property_replace_blob_from_id(drm,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/drm/drm_property.h:282:5: note: declared here
282 | int drm_property_replace_blob_from_id(struct drm_device *dev,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
7436a87db99d5 (drm/tests: hdmi: check the infoframes behaviour)
interacting with
ca59e33f5a1f6 (drm/atomic: add max_size check to drm_property_replace_blob_from_id())
I have applied a fixup:
From 7e99cf59cfdd75f6815ab3eb0b0d8140878bcd6f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Mon, 19 Jan 2026 17:27:36 +0000
Subject: [PATCH] drm: Fix up incompatible API change
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
index d95786faf1817..dc1bda386387d 100644
--- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
@@ -2921,7 +2921,7 @@ static void drm_test_check_reject_hdr_infoframe_bpc_10(struct kunit *test)
ret = drm_property_replace_blob_from_id(drm,
&new_conn_state->hdr_output_metadata,
- hdr_blob->base.id,
+ hdr_blob->base.id, -1,
sizeof(struct hdr_output_metadata), -1,
&replaced);
KUNIT_ASSERT_EQ(test, ret, 0);
--
2.47.3
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2026-01-19 17:37 Mark Brown
@ 2026-01-19 23:09 ` Dmitry Baryshkov
0 siblings, 0 replies; 241+ messages in thread
From: Dmitry Baryshkov @ 2026-01-19 23:09 UTC (permalink / raw)
To: Mark Brown
Cc: Simona Vetter, Intel Graphics, DRI, Thomas Zimmermann,
Maxime Ripard, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Jan 19, 2026 at 05:37:48PM +0000, Mark Brown wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> /tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c: In function 'drm_test_check_reject_hdr_infoframe_bpc_10':
> /tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:2926:49: error: passing argument 6 of 'drm_property_replace_blob_from_id' makes integer from pointer without a cast [-Wint-conversion]
> 2926 | &replaced);
> | ^~~~~~~~~
> | |
> | bool * {aka _Bool *}
> In file included from /tmp/next/build/include/drm/drm_connector.h:33,
> from /tmp/next/build/include/drm/drm_modes.h:33,
> from /tmp/next/build/include/drm/drm_crtc.h:32,
> from /tmp/next/build/include/drm/drm_atomic.h:31,
> from /tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:7:
> /tmp/next/build/include/drm/drm_property.h:287:47: note: expected 'ssize_t' {aka 'long int'} but argument is of type 'bool *' {aka '_Bool *'}
> 287 | ssize_t max_size,
> | ~~~~~~~~^~~~~~~~
> /tmp/next/build/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c:2922:15: error: too few arguments to function 'drm_property_replace_blob_from_id'
> 2922 | ret = drm_property_replace_blob_from_id(drm,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/drm/drm_property.h:282:5: note: declared here
> 282 | int drm_property_replace_blob_from_id(struct drm_device *dev,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 7436a87db99d5 (drm/tests: hdmi: check the infoframes behaviour)
>
> interacting with
>
> ca59e33f5a1f6 (drm/atomic: add max_size check to drm_property_replace_blob_from_id())
>
> I have applied a fixup:
This fixup is correct. I've sent a formal patch,
https://lore.kernel.org/all/20260119-fix-kunit-infoframe-v1-1-5f2f9b066594@oss.qualcomm.com/
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2025-11-03 0:24 Stephen Rothwell
2025-11-03 9:26 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2025-11-03 0:24 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 4599 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c: In function 'rzg2l_du_probe':
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c:173:9: error: implicit declaration of function 'drm_info'; did you mean 'pr_info'? [-Wimplicit-function-declaration]
173 | drm_info(&rcdu->ddev, "Device %s probed\n", dev_name(&pdev->dev));
| ^~~~~~~~
| pr_info
Presumably caused by commit
9695c143b72a ("drm/buddy: replace drm_print.h include with a forward declaration")
or
ea722522d505 ("drm/mm: replace drm_print.h include with a forward declaration")
or
d7a849d126d0 ("drm/ttm: replace drm_print.h include with a forward declaration")
I have applied the following fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Nov 2025 11:12:27 +1100
Subject: [PATCH] fix up for dropping drm_print.h includes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
index e1aa6a719529..c34b1a13e685 100644
--- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
@@ -18,6 +18,7 @@
#include <drm/drm_fbdev_dma.h>
#include <drm/drm_gem_dma_helper.h>
#include <drm/drm_probe_helper.h>
+#include <drm/drm_print.h>
#include "rzg2l_du_drv.h"
#include "rzg2l_du_kms.h"
--
2.51.1
Which lead to this:
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_convert_format':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:215:17: error: implicit declaration of function 'DRM_ERROR'; did you mean 'SO_ERROR'? [-Wimplicit-function-declaration]
215 | DRM_ERROR("unsupported format[%08x]\n", format);
| ^~~~~~~~~
| SO_ERROR
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'rockchip_vop2_mod_supported':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:395:33: error: implicit declaration of function 'drm_dbg_kms' [-Wimplicit-function-declaration]
395 | drm_dbg_kms(vop2->drm,
| ^~~~~~~~~~~
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_setup_scale':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:602:25: error: implicit declaration of function 'drm_dbg'; did you mean 'dev_dbg'? [-Wimplicit-function-declaration]
602 | drm_dbg(vop2->drm, "%s dst_w[%d] should align as 2 pixel\n",
| ^~~~~~~
| dev_dbg
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_core_clks_prepare_enable':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:763:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
763 | drm_err(vop2->drm, "failed to enable hclk - %d\n", ret);
| ^~~~~~~
| pr_err
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_crtc_atomic_disable':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:967:17: error: implicit declaration of function 'drm_info'; did you mean 'pr_info'? [-Wimplicit-function-declaration]
967 | drm_info(vop2->drm, "wait for vp%d dsp_hold timeout\n", vp->id);
| ^~~~~~~~
| pr_info
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_crtc_atomic_enable':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:1758:41: error: implicit declaration of function 'drm_warn'; did you mean 'dev_warn'? [-Wimplicit-function-declaration]
1758 | drm_warn(vop2->drm,
| ^~~~~~~~
| dev_warn
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'rk3576_vp_isr':
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2198:17: error: implicit declaration of function 'drm_err_ratelimited'; did you mean 'pr_err_ratelimited'? [-Wimplicit-function-declaration]
2198 | drm_err_ratelimited(vop2->drm, "POST_BUF_EMPTY irq err at vp%d\n", vp->id);
| ^~~~~~~~~~~~~~~~~~~
| pr_err_ratelimited
So, I have instead used the drm-misc tree from next-20251031 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-11-03 0:24 Stephen Rothwell
@ 2025-11-03 9:26 ` Jani Nikula
2025-11-03 23:11 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Jani Nikula @ 2025-11-03 9:26 UTC (permalink / raw)
To: Stephen Rothwell, Simona Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Thomas Zimmermann
On Mon, 03 Nov 2025, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c: In function 'rzg2l_du_probe':
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c:173:9: error: implicit declaration of function 'drm_info'; did you mean 'pr_info'? [-Wimplicit-function-declaration]
> 173 | drm_info(&rcdu->ddev, "Device %s probed\n", dev_name(&pdev->dev));
> | ^~~~~~~~
> | pr_info
>
> Presumably caused by commit
>
> 9695c143b72a ("drm/buddy: replace drm_print.h include with a forward declaration")
> or
> ea722522d505 ("drm/mm: replace drm_print.h include with a forward declaration")
> or
> d7a849d126d0 ("drm/ttm: replace drm_print.h include with a forward declaration")
>
> I have applied the following fix patch for today:
Thanks for the report, the fix (same as yours) is at [1].
BR,
Jani.
[1] https://lore.kernel.org/r/04f617d5fe37f92d750efbb73065df3997f5c6b5.1762161597.git.jani.nikula@intel.com
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 3 Nov 2025 11:12:27 +1100
> Subject: [PATCH] fix up for dropping drm_print.h includes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
> index e1aa6a719529..c34b1a13e685 100644
> --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
> +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
> @@ -18,6 +18,7 @@
> #include <drm/drm_fbdev_dma.h>
> #include <drm/drm_gem_dma_helper.h>
> #include <drm/drm_probe_helper.h>
> +#include <drm/drm_print.h>
>
> #include "rzg2l_du_drv.h"
> #include "rzg2l_du_kms.h"
> --
> 2.51.1
>
> Which lead to this:
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_convert_format':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:215:17: error: implicit declaration of function 'DRM_ERROR'; did you mean 'SO_ERROR'? [-Wimplicit-function-declaration]
> 215 | DRM_ERROR("unsupported format[%08x]\n", format);
> | ^~~~~~~~~
> | SO_ERROR
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'rockchip_vop2_mod_supported':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:395:33: error: implicit declaration of function 'drm_dbg_kms' [-Wimplicit-function-declaration]
> 395 | drm_dbg_kms(vop2->drm,
> | ^~~~~~~~~~~
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_setup_scale':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:602:25: error: implicit declaration of function 'drm_dbg'; did you mean 'dev_dbg'? [-Wimplicit-function-declaration]
> 602 | drm_dbg(vop2->drm, "%s dst_w[%d] should align as 2 pixel\n",
> | ^~~~~~~
> | dev_dbg
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_core_clks_prepare_enable':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:763:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
> 763 | drm_err(vop2->drm, "failed to enable hclk - %d\n", ret);
> | ^~~~~~~
> | pr_err
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_crtc_atomic_disable':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:967:17: error: implicit declaration of function 'drm_info'; did you mean 'pr_info'? [-Wimplicit-function-declaration]
> 967 | drm_info(vop2->drm, "wait for vp%d dsp_hold timeout\n", vp->id);
> | ^~~~~~~~
> | pr_info
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'vop2_crtc_atomic_enable':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:1758:41: error: implicit declaration of function 'drm_warn'; did you mean 'dev_warn'? [-Wimplicit-function-declaration]
> 1758 | drm_warn(vop2->drm,
> | ^~~~~~~~
> | dev_warn
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c: In function 'rk3576_vp_isr':
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:2198:17: error: implicit declaration of function 'drm_err_ratelimited'; did you mean 'pr_err_ratelimited'? [-Wimplicit-function-declaration]
> 2198 | drm_err_ratelimited(vop2->drm, "POST_BUF_EMPTY irq err at vp%d\n", vp->id);
> | ^~~~~~~~~~~~~~~~~~~
> | pr_err_ratelimited
>
> So, I have instead used the drm-misc tree from next-20251031 for today.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-11-03 9:26 ` Jani Nikula
@ 2025-11-03 23:11 ` Stephen Rothwell
2025-11-04 10:17 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2025-11-03 23:11 UTC (permalink / raw)
To: Jani Nikula
Cc: Simona Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]
Hi all,
On Mon, 03 Nov 2025 11:26:01 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
And now this:
drivers/gpu/drm/hyperv/hyperv_drm_drv.c: In function 'hyperv_setup_vram':
drivers/gpu/drm/hyperv/hyperv_drm_drv.c:80:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
80 | drm_err(dev, "Failed to allocate mmio\n");
| ^~~~~~~
| pr_err
drivers/gpu/drm/hyperv/hyperv_drm_drv.c: In function 'hyperv_vmbus_probe':
drivers/gpu/drm/hyperv/hyperv_drm_drv.c:140:17: error: implicit declaration of function 'drm_warn'; did you mean 'dev_warn'? [-Wimplicit-function-declaration]
140 | drm_warn(dev, "Failed to update vram location.\n");
| ^~~~~~~~
| dev_warn
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_plane_atomic_check':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:161:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
161 | drm_err(&hv->dev, "fb size requested by %s for %dX%d (pitch %d) greater than %ld\n",
| ^~~~~~~
| pr_err
I have used the drm-misc tree from next-20251031 again.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-11-03 23:11 ` Stephen Rothwell
@ 2025-11-04 10:17 ` Jani Nikula
0 siblings, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2025-11-04 10:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simona Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
On Tue, 04 Nov 2025, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 03 Nov 2025 11:26:01 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>>
> And now this:
>
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c: In function 'hyperv_setup_vram':
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c:80:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
> 80 | drm_err(dev, "Failed to allocate mmio\n");
> | ^~~~~~~
> | pr_err
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c: In function 'hyperv_vmbus_probe':
> drivers/gpu/drm/hyperv/hyperv_drm_drv.c:140:17: error: implicit declaration of function 'drm_warn'; did you mean 'dev_warn'? [-Wimplicit-function-declaration]
> 140 | drm_warn(dev, "Failed to update vram location.\n");
> | ^~~~~~~~
> | dev_warn
> drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_plane_atomic_check':
> drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:161:17: error: implicit declaration of function 'drm_err'; did you mean 'pr_err'? [-Wimplicit-function-declaration]
> 161 | drm_err(&hv->dev, "fb size requested by %s for %dX%d (pitch %d) greater than %ld\n",
> | ^~~~~~~
> | pr_err
>
> I have used the drm-misc tree from next-20251031 again.
And now this fix [1]...
Thanks for the report, and sorry for the trouble.
BR,
Jani.
[1] https://lore.kernel.org/r/20251104100253.646577-1-jani.nikula@intel.com
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2025-08-29 2:23 Stephen Rothwell
2025-08-29 8:01 ` Danilo Krummrich
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2025-08-29 2:23 UTC (permalink / raw)
To: Simona Vetter
Cc: Alice Ryhl, Danilo Krummrich, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
drivers/gpu/drm/tests/drm_exec_test.c:171:1: error: the frame size of 2136 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
171 | }
| ^
cc1: all warnings being treated as errors
Possibly caused by commit
e7fa80e2932c ("drm_gem: add mutex to drm_gem_object.gpuva")
I have used the drm-misc tree from next-20250828 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2025-08-29 2:23 Stephen Rothwell
@ 2025-08-29 8:01 ` Danilo Krummrich
0 siblings, 0 replies; 241+ messages in thread
From: Danilo Krummrich @ 2025-08-29 8:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simona Vetter, Alice Ryhl, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
On Fri Aug 29, 2025 at 4:23 AM CEST, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
> drivers/gpu/drm/tests/drm_exec_test.c:171:1: error: the frame size of 2136 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 171 | }
> | ^
> cc1: all warnings being treated as errors
>
> Possibly caused by commit
>
> e7fa80e2932c ("drm_gem: add mutex to drm_gem_object.gpuva")
Thanks for reporting!
Unfortunately, it didn't happen with my configuration, but I could reproduce it
with a simple allmodconfig. I've send a fix for this [1].
[1] https://lore.kernel.org/dri-devel/20250829075633.2306-1-dakr@kernel.org/
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2025-07-15 3:55 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2025-07-15 3:55 UTC (permalink / raw)
To: Simona Vetter
Cc: Andy Yan, Dmitry Baryshkov, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c: In function 'ge_b850v3_lvds_detect':
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:145:16: error: too few arguments to function 'ge_b850v3_lvds_bridge_detect'
145 | return ge_b850v3_lvds_bridge_detect(&ge_b850v3_lvds_ptr->bridge);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:124:1: note: declared here
124 | ge_b850v3_lvds_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:146:1: error: control reaches end of non-void function [-Werror=return-type]
146 | }
| ^
Caused by commit
5d156a9c3d5e ("drm/bridge: Pass down connector to drm bridge detect hook")
I have used the drm-misc tree from next-20250714 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2025-02-13 0:38 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2025-02-13 0:38 UTC (permalink / raw)
To: Simona Vetter, Intel Graphics
Cc: Dmitry Baryshkov, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
scripts/Makefile.build:41: drivers/gpu/drm/i2c/Makefile: No such file or directory
make[7]: *** No rule to make target 'drivers/gpu/drm/i2c/Makefile'. Stop.
Presuably caused by commit
325ba852d148 ("drm/i2c: move TDA998x driver under drivers/gpu/drm/bridge")
I have used the drm-misc tree from next-20250212 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2024-12-09 1:17 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-12-09 1:17 UTC (permalink / raw)
To: Simona Vetter
Cc: Peter Zijlstra, Dmitry Osipenko, Vivek Kasireddy, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2467 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/module.h:22,
from include/linux/device/driver.h:21,
from include/linux/device.h:32,
from include/linux/dma-mapping.h:5,
from include/linux/dma-buf.h:21,
from include/linux/virtio_dma_buf.h:11,
from drivers/gpu/drm/virtio/virtgpu_prime.c:26:
drivers/gpu/drm/virtio/virtgpu_prime.c:30:18: error: expected ',' or ';' before 'DMA_BUF'
30 | MODULE_IMPORT_NS(DMA_BUF);
| ^~~~~~~
include/linux/moduleparam.h:26:61: note: in definition of macro '__MODULE_INFO'
26 | = __MODULE_INFO_PREFIX __stringify(tag) "=" info
| ^~~~
include/linux/module.h:299:33: note: in expansion of macro 'MODULE_INFO'
299 | #define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, ns)
| ^~~~~~~~~~~
drivers/gpu/drm/virtio/virtgpu_prime.c:30:1: note: in expansion of macro 'MODULE_IMPORT_NS'
30 | MODULE_IMPORT_NS(DMA_BUF);
| ^~~~~~~~~~~~~~~~
Caused by commit
25c3fd1183c0 ("drm/virtio: Add a helper to map and note the dma addrs and lengths")
Interacting with commit
cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
from Linus' tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Dec 2024 12:08:24 +1100
Subject: [PATCH] fix up for "drm/virtio: Add a helper to map and note the dma
addrs and lengths"
interacting with commit
cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
from Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 688810d1b611..b3664c12843d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -27,7 +27,7 @@
#include "virtgpu_drv.h"
-MODULE_IMPORT_NS(DMA_BUF);
+MODULE_IMPORT_NS("DMA_BUF");
static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
uuid_t *uuid)
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2024-09-04 2:52 Stephen Rothwell
2024-09-04 9:57 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-09-04 2:52 UTC (permalink / raw)
To: Daniel Vetter
Cc: Marc Gonzalez, Robert Foss, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
31 | gpiod_set_value_cansleep(tdp158->enable, 1);
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
| ^~~~~~~~~~~~~~~~~~~~~~~
| devm_regulator_get_optional
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
| ^~~~~~~~~~~~~
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
a15710027afb ("drm/bridge: add support for TI TDP158")
I have used the drm-misc tree from next-20240903 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-09-04 2:52 Stephen Rothwell
@ 2024-09-04 9:57 ` Jani Nikula
0 siblings, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2024-09-04 9:57 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Marc Gonzalez, Robert Foss, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
On Wed, 04 Sep 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
> drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
> 31 | gpiod_set_value_cansleep(tdp158->enable, 1);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
> drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
> 80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
> | ^~~~~~~~~~~~~~~~~~~~~~~
> | devm_regulator_get_optional
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
> 80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
> | ^~~~~~~~~~~~~
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
> a15710027afb ("drm/bridge: add support for TI TDP158")
>
> I have used the drm-misc tree from next-20240903 for today.
Fixed by commit 532f0d109658 ("drm/bridge/tdp158: fix build failure") in
drm-misc-next.
BR,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-05-29 2:35 Stephen Rothwell
2024-05-29 8:21 ` Maxime Ripard
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-05-29 2:35 UTC (permalink / raw)
To: Daniel Vetter
Cc: Maxime Ripard, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 830 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function 'sun4i_hdmi_connector_mode_valid':
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of function 'drm_connector_hdmi_compute_mode_clock'; did you mean 'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
213 | drm_connector_hdmi_compute_mode_clock(mode, 8,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| drm_hdmi_compute_mode_clock
cc1: some warnings being treated as errors
Caused by commit
ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")
I have used the drm-misc tree from next-20240528 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-05-29 2:35 Stephen Rothwell
@ 2024-05-29 8:21 ` Maxime Ripard
0 siblings, 0 replies; 241+ messages in thread
From: Maxime Ripard @ 2024-05-29 8:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]
Hi,
On Wed, May 29, 2024 at 12:35:31PM GMT, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function 'sun4i_hdmi_connector_mode_valid':
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of function 'drm_connector_hdmi_compute_mode_clock'; did you mean 'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
> 213 | drm_connector_hdmi_compute_mode_clock(mode, 8,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | drm_hdmi_compute_mode_clock
> cc1: some warnings being treated as errors
>
> Caused by commit
>
> ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")
>
> I have used the drm-misc tree from next-20240528 for today.
Thanks for the report. A fix is now merged into drm-misc-next
https://lore.kernel.org/dri-devel/20240528151056.2104153-1-mripard@kernel.org/
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 273 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-05-29 2:29 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-05-29 2:29 UTC (permalink / raw)
To: Daniel Vetter
Cc: Maíra Canal, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 4577 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_bo.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_fence.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_gem.c:15:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_mmu.c:21:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_irq.c:19:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_sched.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_trace_points.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_sysfs.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_debugfs.c:12:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_submit.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
3cbcbe016c31 ("drm/v3d: Add Performance Counters descriptions for V3D 4.2 and 7.1")
I have used the drm-misc tree from next-20240528 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2024-04-02 23:47 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-04-02 23:47 UTC (permalink / raw)
To: Daniel Vetter
Cc: Boris Brezillon, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3715 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build
(x86_64_allmodconfig) failed like this:
In file included from drivers/gpu/drm/panthor/panthor_fw.c:19:
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
326 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
336 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_gpu.c:19:
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
326 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
336 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_mmu.c:30:
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
326 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
336 | int cookie; \
| ^~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Caused by commit
962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()")
I have used the drm-misc tree from next-20240402 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-22 1:46 Stephen Rothwell
2024-02-22 8:14 ` Biju Das
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-22 1:46 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics, DRI, Biju Das, Maxime Ripard,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2985 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of 'rzg2l_du_vsp_enable'
47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc *)'
72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) { };
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of 'rzg2l_du_vsp_disable'
61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc *)'
73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { };
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of 'rzg2l_du_vsp_atomic_flush'
66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct rzg2l_du_crtc *)'
74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) { };
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of 'rzg2l_du_vsp_get_drm_plane'
76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of 'rzg2l_du_vsp_init'
302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *, struct device_node *, unsigned int)'
66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
| ^~~~~~~~~~~~~~~~~
Caused by commit
768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
I have used the drm-misc tree from next-20240221 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* RE: linux-next: build failure after merge of the drm-misc tree
2024-02-22 1:46 Stephen Rothwell
@ 2024-02-22 8:14 ` Biju Das
2024-02-22 8:29 ` Geert Uytterhoeven
2024-02-22 8:32 ` Maxime Ripard
0 siblings, 2 replies; 241+ messages in thread
From: Biju Das @ 2024-02-22 8:14 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Intel Graphics, DRI, Maxime Ripard, Linux Kernel Mailing List,
Linux Next Mailing List, Geert Uytterhoeven
Hi All,
> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: Thursday, February 22, 2024 1:46 AM
> Subject: linux-next: build failure after merge of the drm-misc tree
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> 'rzg2l_du_vsp_enable'
> 47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> | ^~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> *)'
> 72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> { };
> | ^~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> 'rzg2l_du_vsp_disable'
> 61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> *)'
> 73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> *crtc) { };
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> 'rzg2l_du_vsp_atomic_flush'
> 66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> rzg2l_du_crtc *)'
> 74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> *crtc) { };
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> 'rzg2l_du_vsp_get_drm_plane'
> 76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> *crtc,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> *(struct rzg2l_du_crtc *, unsigned int)'
> 75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> rzg2l_du_crtc *crtc,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> 'rzg2l_du_vsp_init'
> 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> *np,
> | ^~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> struct device_node *, unsigned int)'
> 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> struct device_node *np,
> | ^~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
>
> I have used the drm-misc tree from next-20240221 for today.
I will send an incremental patch to fix this build error with x86 on drm-next.
I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
Cheers,
Biju
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-22 8:14 ` Biju Das
@ 2024-02-22 8:29 ` Geert Uytterhoeven
2024-02-22 9:16 ` Biju Das
2024-02-22 8:32 ` Maxime Ripard
1 sibling, 1 reply; 241+ messages in thread
From: Geert Uytterhoeven @ 2024-02-22 8:29 UTC (permalink / raw)
To: Biju Das
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Maxime Ripard, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Biju,
On Thu, Feb 22, 2024 at 9:14 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> > 47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> > 72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> > | ^~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> > 61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> > 73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> > | ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> > 66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> > 74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> > 76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> > 75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> > | ^~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> > 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> > | ^~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> >
> > I have used the drm-misc tree from next-20240221 for today.
>
> I will send an incremental patch to fix this build error with x86 on drm-next.
>
> I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 241+ messages in thread* RE: linux-next: build failure after merge of the drm-misc tree
2024-02-22 8:29 ` Geert Uytterhoeven
@ 2024-02-22 9:16 ` Biju Das
0 siblings, 0 replies; 241+ messages in thread
From: Biju Das @ 2024-02-22 9:16 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Maxime Ripard, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Geert,
Thanks for the feedback.
> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Thursday, February 22, 2024 8:29 AM
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
>
> Hi Biju,
>
> On Thu, Feb 22, 2024 at 9:14 AM Biju Das <biju.das.jz@bp.renesas.com>
> wrote:
> > > -----Original Message-----
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > > 47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > > 61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > > 66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > > 76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > > 75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > > | ^~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > > 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > > | ^~~~~~~~~~~~~~~~~
> > >
> > > Caused by commit
> > >
> > > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
> >
> > I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> > in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
>
> Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?
Yes, Will add this aswell, as CONFIG_VIDEO_RENESAS_VSP1=m for x86.
Cheers,
Biju
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-22 8:14 ` Biju Das
2024-02-22 8:29 ` Geert Uytterhoeven
@ 2024-02-22 8:32 ` Maxime Ripard
2024-02-22 8:49 ` Biju Das
1 sibling, 1 reply; 241+ messages in thread
From: Maxime Ripard @ 2024-02-22 8:32 UTC (permalink / raw)
To: Biju Das
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List,
Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 3682 bytes --]
Hi Biju,
On Thu, Feb 22, 2024 at 08:14:14AM +0000, Biju Das wrote:
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> >
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> > 47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> > 72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> > | ^~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> > 61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> > 73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> > | ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> > 66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> > 74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> > 76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> > 75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> > | ^~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> > 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> > | ^~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> >
> > I have used the drm-misc tree from next-20240221 for today.
>
> I will send an incremental patch to fix this build error with x86 on drm-next.
Any chance you can do it today? We need to send the drm-misc-next PR.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* RE: linux-next: build failure after merge of the drm-misc tree
2024-02-22 8:32 ` Maxime Ripard
@ 2024-02-22 8:49 ` Biju Das
0 siblings, 0 replies; 241+ messages in thread
From: Biju Das @ 2024-02-22 8:49 UTC (permalink / raw)
To: Maxime Ripard
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List,
Geert Uytterhoeven
Hi Maxime Ripard,
> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Thursday, February 22, 2024 8:32 AM
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
>
> Hi Biju,
>
> On Thu, Feb 22, 2024 at 08:14:14AM +0000, Biju Das wrote:
> > > -----Original Message-----
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > > 47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > > 61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > > 66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > > 74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > > 76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > > 75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > > | ^~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > > 66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > > | ^~~~~~~~~~~~~~~~~
> > >
> > > Caused by commit
> > >
> > > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
>
> Any chance you can do it today? We need to send the drm-misc-next PR.
Yes I am on it.
Cheers,
Biju
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-13 1:04 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-13 1:04 UTC (permalink / raw)
To: Daniel Vetter
Cc: Jani Nikula, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/xe/xe_guc_submit.c: In function 'simple_error_capture':
drivers/gpu/drm/xe/xe_guc_submit.c:814:48: error: passing argument 1 of 'drm_err_printer' from incompatible pointer type [-Werror=incompatible-pointer-types]
814 | struct drm_printer p = drm_err_printer("");
| ^~
| |
| char *
In file included from drivers/gpu/drm/xe/xe_assert.h:11,
from drivers/gpu/drm/xe/xe_guc_submit.c:19:
include/drm/drm_print.h:349:69: note: expected 'struct drm_device *' but argument is of type 'char *'
349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
| ~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/xe/xe_guc_submit.c:814:32: error: too few arguments to function 'drm_err_printer'
814 | struct drm_printer p = drm_err_printer("");
| ^~~~~~~~~~~~~~~
include/drm/drm_print.h:349:34: note: declared here
349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
| ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Caused by commit
5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()")
I have used the drm-misc tree from next-20240209 again today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-12 1:26 Stephen Rothwell
2024-02-12 9:12 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-12 1:26 UTC (permalink / raw)
To: Daniel Vetter
Cc: Jani Nikula, Dave Airlie, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 859 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
191 | struct drm_printer p = drm_debug_printer(test->name);
| ^~~~~~~~~~~~~~~~~
| drm_dbg_printer
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
cc1: all warnings being treated as errors
Caused by commit
e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
I have used the drm-misc tree from next-20240209 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-12 1:26 Stephen Rothwell
@ 2024-02-12 9:12 ` Jani Nikula
2024-02-12 13:09 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Jani Nikula @ 2024-02-12 9:12 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Dave Airlie, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, 12 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
> 191 | struct drm_printer p = drm_debug_printer(test->name);
> | ^~~~~~~~~~~~~~~~~
> | drm_dbg_printer
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>
> I have used the drm-misc tree from next-20240209 for today.
Fix at [1].
BR,
Jani.
[1] https://lore.kernel.org/r/20240209140818.106685-1-michal.winiarski@intel.com
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-12 9:12 ` Jani Nikula
@ 2024-02-12 13:09 ` Jani Nikula
0 siblings, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2024-02-12 13:09 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Dave Airlie, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, 12 Feb 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> On Mon, 12 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
>> 191 | struct drm_printer p = drm_debug_printer(test->name);
>> | ^~~~~~~~~~~~~~~~~
>> | drm_dbg_printer
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
>> cc1: all warnings being treated as errors
>>
>> Caused by commit
>>
>> e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>>
>> I have used the drm-misc tree from next-20240209 for today.
>
> Fix at [1].
Commit 826eafebf68b ("drm/tests: mm: Convert to drm_dbg_printer") in
drm-misc-next.
>
> BR,
> Jani.
>
>
> [1] https://lore.kernel.org/r/20240209140818.106685-1-michal.winiarski@intel.com
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-06 4:28 Stephen Rothwell
2024-02-12 1:25 ` Stephen Rothwell
2024-02-12 13:15 ` Jani Nikula
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-06 4:28 UTC (permalink / raw)
To: Daniel Vetter
Cc: Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1773 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (i386 defconfig)
failed like this:
In function 'i915_ttm_placement_from_obj',
inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
| ~~~~~~~~~^~~~~~
drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
| ^~~~~~
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
I applied the following hack for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Feb 2024 15:17:54 +1100
Subject: [PATCH] drm/ttm: initialise places
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 80c6cafc8887..34e699e67c25 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
{
- struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
+ struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
struct ttm_placement placement;
/* restricted by sg_alloc_table */
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 4:28 Stephen Rothwell
@ 2024-02-12 1:25 ` Stephen Rothwell
2024-02-12 13:15 ` Jani Nikula
1 sibling, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-12 1:25 UTC (permalink / raw)
To: Daniel Vetter
Cc: Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 1987 bytes --]
Hi all,
On Tue, 6 Feb 2024 15:28:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> In function 'i915_ttm_placement_from_obj',
> inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> | ~~~~~~~~~^~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> | ^~~~~~
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> I applied the following hack for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>
> static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> {
> - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> struct ttm_placement placement;
>
> /* restricted by sg_alloc_table */
> --
> 2.43.0
I am still applying the above patch :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 4:28 Stephen Rothwell
2024-02-12 1:25 ` Stephen Rothwell
@ 2024-02-12 13:15 ` Jani Nikula
2024-02-19 21:48 ` Stephen Rothwell
1 sibling, 1 reply; 241+ messages in thread
From: Jani Nikula @ 2024-02-12 13:15 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, zack.rusin,
tzimmermann, thomas.hellstrom, Joonas Lahtinen, Tvrtko Ursulin
On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> In function 'i915_ttm_placement_from_obj',
> inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> | ~~~~~~~~~^~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> | ^~~~~~
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
Cc: more people.
>
> I applied the following hack for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>
> static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> {
> - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> struct ttm_placement placement;
>
> /* restricted by sg_alloc_table */
> --
> 2.43.0
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-12 13:15 ` Jani Nikula
@ 2024-02-19 21:48 ` Stephen Rothwell
2024-02-25 21:41 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-19 21:48 UTC (permalink / raw)
To: Jani Nikula
Cc: Daniel Vetter, Christian König, Somalapuram Amaranath,
Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, zack.rusin, tzimmermann,
thomas.hellstrom, Joonas Lahtinen, Tvrtko Ursulin
[-- Attachment #1: Type: text/plain, Size: 2177 bytes --]
Hi all,
On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > failed like this:
> >
> > In function 'i915_ttm_placement_from_obj',
> > inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > | ~~~~~~~~~^~~~~~
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > | ^~~~~~
> >
> > Caused by commit
> >
> > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> Cc: more people.
>
> >
> > I applied the following hack for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > Subject: [PATCH] drm/ttm: initialise places
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > index 80c6cafc8887..34e699e67c25 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> >
> > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > {
> > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > struct ttm_placement placement;
> >
> > /* restricted by sg_alloc_table */
> > --
> > 2.43.0
I am still applying the above patch ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-19 21:48 ` Stephen Rothwell
@ 2024-02-25 21:41 ` Stephen Rothwell
2024-02-25 21:47 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-25 21:41 UTC (permalink / raw)
To: Jani Nikula
Cc: Daniel Vetter, Christian König, Somalapuram Amaranath,
Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, zack.rusin, tzimmermann,
thomas.hellstrom, Joonas Lahtinen, Tvrtko Ursulin
[-- Attachment #1: Type: text/plain, Size: 2393 bytes --]
Hi all,
On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
> >
> > On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > > failed like this:
> > >
> > > In function 'i915_ttm_placement_from_obj',
> > > inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > > | ~~~~~~~~~^~~~~~
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > | ^~~~~~
> > >
> > > Caused by commit
> > >
> > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> >
> > Cc: more people.
> >
> > >
> > > I applied the following hack for today:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > Subject: [PATCH] drm/ttm: initialise places
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > index 80c6cafc8887..34e699e67c25 100644
> > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> > >
> > > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > > {
> > > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > > struct ttm_placement placement;
> > >
> > > /* restricted by sg_alloc_table */
> > > --
> > > 2.43.0
>
> I am still applying the above patch ...
Any progress?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-25 21:41 ` Stephen Rothwell
@ 2024-02-25 21:47 ` Stephen Rothwell
2024-02-26 12:56 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-25 21:47 UTC (permalink / raw)
To: Jani Nikula
Cc: Daniel Vetter, Christian König, Somalapuram Amaranath,
Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, zack.rusin, tzimmermann,
thomas.hellstrom, Joonas Lahtinen, Tvrtko Ursulin, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 2645 bytes --]
Hi all,
On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
> > >
> > > On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > > > failed like this:
> > > >
> > > > In function 'i915_ttm_placement_from_obj',
> > > > inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > > > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > > > | ~~~~~~~~~^~~~~~
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > > > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > > | ^~~~~~
> > > >
> > > > Caused by commit
> > > >
> > > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> > >
> > > Cc: more people.
> > >
> > > >
> > > > I applied the following hack for today:
> > > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > > Subject: [PATCH] drm/ttm: initialise places
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > index 80c6cafc8887..34e699e67c25 100644
> > > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> > > >
> > > > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > > > {
> > > > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > > > struct ttm_placement placement;
> > > >
> > > > /* restricted by sg_alloc_table */
> > > > --
> > > > 2.43.0
> >
> > I am still applying the above patch ...
>
> Any progress?
And this commit is now in the drm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-25 21:47 ` Stephen Rothwell
@ 2024-02-26 12:56 ` Christian König
0 siblings, 0 replies; 241+ messages in thread
From: Christian König @ 2024-02-26 12:56 UTC (permalink / raw)
To: Stephen Rothwell, Jani Nikula
Cc: Daniel Vetter, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, zack.rusin,
tzimmermann, thomas.hellstrom, Joonas Lahtinen, Tvrtko Ursulin,
Dave Airlie
Am 25.02.24 um 22:47 schrieb Stephen Rothwell:
> Hi all,
>
> On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>>>> On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
>>>>> failed like this:
>>>>>
>>>>> In function 'i915_ttm_placement_from_obj',
>>>>> inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
>>>>> 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
>>>>> | ~~~~~~~~~^~~~~~
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
>>>>> 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>>>>> | ^~~~~~
>>>>>
>>>>> Caused by commit
>>>>>
>>>>> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>>>> Cc: more people.
>>>>
>>>>> I applied the following hack for today:
>>>>>
>>>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>>>> Date: Tue, 6 Feb 2024 15:17:54 +1100
>>>>> Subject: [PATCH] drm/ttm: initialise places
>>>>>
>>>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>>>> ---
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> index 80c6cafc8887..34e699e67c25 100644
>>>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>>>>>
>>>>> static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
>>>>> {
>>>>> - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>>>>> + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
>>>>> struct ttm_placement placement;
>>>>>
>>>>> /* restricted by sg_alloc_table */
>>>>> --
>>>>> 2.43.0
>>> I am still applying the above patch ...
>> Any progress?
> And this commit is now in the drm tree.
Sorry for the delay. Oring in the flag needs to come after the call and
not before it.
Going to fix this.
Thanks,
Christian.
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-06 1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-06 1:28 UTC (permalink / raw)
To: Daniel Vetter
Cc: Matthew Brost, Rodrigo Vivi, Christian König,
Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2864 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
interacting with commit
dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
(and maybe others) from Linus' tree (v6.8-rc1).
I have applied the following merge fix patch for today. This makes it build,
but more is likely needed ...
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Feb 2024 12:21:07 +1100
Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
interacting with commit
dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/xe/xe_bo.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 0b0e262e2166..280dbda8ae5a 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags = {
static struct ttm_placement sys_placement = {
.num_placement = 1,
.placement = &sys_placement_flags,
- .num_busy_placement = 1,
- .busy_placement = &sys_placement_flags,
};
static const struct ttm_place tt_placement_flags = {
@@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags = {
static struct ttm_placement tt_placement = {
.num_placement = 1,
.placement = &tt_placement_flags,
- .num_busy_placement = 1,
- .busy_placement = &sys_placement_flags,
};
bool mem_type_is_vram(u32 mem_type)
@@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct xe_device *xe, struct xe_bo *bo,
bo->placement = (struct ttm_placement) {
.num_placement = c,
.placement = bo->placements,
- .num_busy_placement = c,
- .busy_placement = bo->placements,
};
return 0;
@@ -251,7 +245,6 @@ static void xe_evict_flags(struct ttm_buffer_object *tbo,
/* Don't handle scatter gather BOs */
if (tbo->type == ttm_bo_type_sg) {
placement->num_placement = 0;
- placement->num_busy_placement = 0;
return;
}
@@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct xe_device *xe,
bo->placement = (struct ttm_placement) {
.num_placement = 1,
.placement = place,
- .num_busy_placement = 1,
- .busy_placement = place,
};
return 0;
@@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type)
xe_place_from_ttm_type(mem_type, &requested);
placement.num_placement = 1;
- placement.num_busy_placement = 1;
placement.placement = &requested;
- placement.busy_placement = &requested;
/*
* Stolen needs to be handled like below VRAM handling if we ever need
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 Stephen Rothwell
@ 2024-02-06 11:46 ` Jani Nikula
2024-02-06 12:39 ` Thomas Hellström
2024-02-07 2:46 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2024-02-06 11:46 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Matthew Brost, Rodrigo Vivi, Christian König,
Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List,
Lucas De Marchi, Oded Gabbay, Thomas Hellström, intel-xe
On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
>
> I have applied the following merge fix patch for today. This makes it build,
> but more is likely needed ...
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/xe/xe_bo.c | 11 -----------
> 1 file changed, 11 deletions(-)
Please see the new MAINTAINERS entry for drm/xe changes:
INTEL DRM XE DRIVER (Lunar Lake and newer)
M: Lucas De Marchi <lucas.demarchi@intel.com>
M: Oded Gabbay <ogabbay@kernel.org>
M: Thomas Hellström <thomas.hellstrom@linux.intel.com>
L: intel-xe@lists.freedesktop.org
BR,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
@ 2024-02-06 12:39 ` Thomas Hellström
2024-02-07 2:46 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Thomas Hellström @ 2024-02-06 12:39 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Matthew Brost, Rodrigo Vivi, Christian König,
Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
Hi
On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
>
> I have applied the following merge fix patch for today. This makes
> it build,
> but more is likely needed ...
There was a manual fixup for the drm-misc-next merge into drm-tip that
did the right thing here.
How do we ensure these are included into the linux-next builds?
Thanks,
Thomas
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with
> flags v6"
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/xe/xe_bo.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 0b0e262e2166..280dbda8ae5a 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags =
> {
> static struct ttm_placement sys_placement = {
> .num_placement = 1,
> .placement = &sys_placement_flags,
> - .num_busy_placement = 1,
> - .busy_placement = &sys_placement_flags,
> };
>
> static const struct ttm_place tt_placement_flags = {
> @@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags =
> {
> static struct ttm_placement tt_placement = {
> .num_placement = 1,
> .placement = &tt_placement_flags,
> - .num_busy_placement = 1,
> - .busy_placement = &sys_placement_flags,
> };
>
> bool mem_type_is_vram(u32 mem_type)
> @@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct
> xe_device *xe, struct xe_bo *bo,
> bo->placement = (struct ttm_placement) {
> .num_placement = c,
> .placement = bo->placements,
> - .num_busy_placement = c,
> - .busy_placement = bo->placements,
> };
>
> return 0;
> @@ -251,7 +245,6 @@ static void xe_evict_flags(struct
> ttm_buffer_object *tbo,
> /* Don't handle scatter gather BOs */
> if (tbo->type == ttm_bo_type_sg) {
> placement->num_placement = 0;
> - placement->num_busy_placement = 0;
> return;
> }
>
> @@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct
> xe_device *xe,
> bo->placement = (struct ttm_placement) {
> .num_placement = 1,
> .placement = place,
> - .num_busy_placement = 1,
> - .busy_placement = place,
> };
>
> return 0;
> @@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32
> mem_type)
>
> xe_place_from_ttm_type(mem_type, &requested);
> placement.num_placement = 1;
> - placement.num_busy_placement = 1;
> placement.placement = &requested;
> - placement.busy_placement = &requested;
>
> /*
> * Stolen needs to be handled like below VRAM handling if we
> ever need
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
2024-02-06 12:39 ` Thomas Hellström
@ 2024-02-07 2:46 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2024-02-07 2:46 UTC (permalink / raw)
To: Daniel Vetter
Cc: Matthew Brost, Rodrigo Vivi, Christian König,
Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 6000 bytes --]
Hi all,
On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
drivers/gpu/drm/xe/xe_bo.c:41:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
41 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in struct initializer [-Werror]
41 | .num_busy_placement = 1,
| ^
drivers/gpu/drm/xe/xe_bo.c:41:31: note: (near initialization for 'sys_placement')
drivers/gpu/drm/xe/xe_bo.c:42:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
42 | .busy_placement = &sys_placement_flags,
| ^~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:42:27: error: excess elements in struct initializer [-Werror]
42 | .busy_placement = &sys_placement_flags,
| ^
drivers/gpu/drm/xe/xe_bo.c:42:27: note: (near initialization for 'sys_placement')
drivers/gpu/drm/xe/xe_bo.c:55:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
55 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:55:31: error: excess elements in struct initializer [-Werror]
55 | .num_busy_placement = 1,
| ^
drivers/gpu/drm/xe/xe_bo.c:55:31: note: (near initialization for 'tt_placement')
drivers/gpu/drm/xe/xe_bo.c:56:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
56 | .busy_placement = &sys_placement_flags,
| ^~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:56:27: error: excess elements in struct initializer [-Werror]
56 | .busy_placement = &sys_placement_flags,
| ^
drivers/gpu/drm/xe/xe_bo.c:56:27: note: (near initialization for 'tt_placement')
drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_placement_for_flags':
drivers/gpu/drm/xe/xe_bo.c:233:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
233 | .num_busy_placement = c,
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:233:39: error: excess elements in struct initializer [-Werror]
233 | .num_busy_placement = c,
| ^
drivers/gpu/drm/xe/xe_bo.c:233:39: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c:234:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
234 | .busy_placement = bo->placements,
| ^~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:234:35: error: excess elements in struct initializer [-Werror]
234 | .busy_placement = bo->placements,
| ^~
drivers/gpu/drm/xe/xe_bo.c:234:35: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c: In function 'xe_evict_flags':
drivers/gpu/drm/xe/xe_bo.c:254:36: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
254 | placement->num_busy_placement = 0;
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_fixed_placement':
drivers/gpu/drm/xe/xe_bo.c:1356:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
1356 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:1356:39: error: excess elements in struct initializer [-Werror]
1356 | .num_busy_placement = 1,
| ^
drivers/gpu/drm/xe/xe_bo.c:1356:39: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c:1357:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
1357 | .busy_placement = place,
| ^~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:1357:35: error: excess elements in struct initializer [-Werror]
1357 | .busy_placement = place,
| ^~~~~
drivers/gpu/drm/xe/xe_bo.c:1357:35: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c: In function 'xe_bo_migrate':
drivers/gpu/drm/xe/xe_bo.c:2115:19: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
2115 | placement.num_busy_placement = 1;
| ^~~~~~~~~~~~~~~~~~
| num_placement
drivers/gpu/drm/xe/xe_bo.c:2117:19: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
2117 | placement.busy_placement = &requested;
| ^~~~~~~~~~~~~~
| num_placement
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
Given that the latter above commit(s) are also in the drm-misc tree, I
have just used the drm-misc tree from next-20240205 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2023-11-26 23:38 Stephen Rothwell
2023-11-27 2:12 ` Luben Tuikov
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2023-11-26 23:38 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Luben Tuikov, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_sched.c:21:41: error: 'DRM_SCHED_PRIORITY_MIN' undeclared here (not in a function); did you mean 'DRM_SCHED_PRIORITY_LOW'?
21 | NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN,
| ^~~~~~~~~~~~~~~~~~~~~~
| DRM_SCHED_PRIORITY_LOW
Caused by commit
fe375c74806d ("drm/sched: Rename priority MIN to LOW")
I have used the drm-misc tree from next-20231124 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-11-26 23:38 Stephen Rothwell
@ 2023-11-27 2:12 ` Luben Tuikov
0 siblings, 0 replies; 241+ messages in thread
From: Luben Tuikov @ 2023-11-27 2:12 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1.1: Type: text/plain, Size: 835 bytes --]
On 2023-11-26 18:38, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_sched.c:21:41: error: 'DRM_SCHED_PRIORITY_MIN' undeclared here (not in a function); did you mean 'DRM_SCHED_PRIORITY_LOW'?
> 21 | NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN,
> | ^~~~~~~~~~~~~~~~~~~~~~
> | DRM_SCHED_PRIORITY_LOW
>
> Caused by commit
>
> fe375c74806d ("drm/sched: Rename priority MIN to LOW")
>
> I have used the drm-misc tree from next-20231124 for today.
I posted a fix for this yesterday:
https://lore.kernel.org/r/20231125192246.87268-2-ltuikov89@gmail.com
--
Regards,
Luben
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 677 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2023-10-12 1:22 Stephen Rothwell
2023-10-12 1:27 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2023-10-12 1:22 UTC (permalink / raw)
To: Daniel Vetter
Cc: Greg Kroah-Hartman, RD Babiera, Intel Graphics, DRI,
Bjorn Andersson, Bjorn Andersson, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2164 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event'
309 | drm_connector_oob_hotplug_event(dp->connector_fwnode);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/usb/typec/altmodes/displayport.c:17:
include/drm/drm_connector.h:1984:6: note: declared here
1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
interacting with commit
89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
from the usb.current tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Oct 2023 12:17:31 +1100
Subject: [PATCH] fix up for "drm: Add HPD state to
drm_connector_oob_hotplug_event()"
interacting with commit
89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/usb/typec/altmodes/displayport.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index ddfb5b6ace4f..eb0bf08fc97a 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
dp->data.status = 0;
dp->data.conf = 0;
if (dp->hpd) {
- drm_connector_oob_hotplug_event(dp->connector_fwnode);
+ drm_connector_oob_hotplug_event(dp->connector_fwnode
+ connector_status_disconnected);
dp->hpd = false;
sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
}
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-10-12 1:22 Stephen Rothwell
@ 2023-10-12 1:27 ` Stephen Rothwell
2023-10-12 7:09 ` Greg Kroah-Hartman
2023-10-20 2:00 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2023-10-12 1:27 UTC (permalink / raw)
To: Daniel Vetter
Cc: Greg Kroah-Hartman, RD Babiera, Intel Graphics, DRI,
Bjorn Andersson, Bjorn Andersson, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2426 bytes --]
Hi all,
On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event'
> 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/usb/typec/altmodes/displayport.c:17:
> include/drm/drm_connector.h:1984:6: note: declared here
> 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
>
> interacting with commit
>
> 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
>
> from the usb.current tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 12 Oct 2023 12:17:31 +1100
> Subject: [PATCH] fix up for "drm: Add HPD state to
> drm_connector_oob_hotplug_event()"
>
> interacting with commit
>
> 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/usb/typec/altmodes/displayport.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
> index ddfb5b6ace4f..eb0bf08fc97a 100644
> --- a/drivers/usb/typec/altmodes/displayport.c
> +++ b/drivers/usb/typec/altmodes/displayport.c
> @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> dp->data.status = 0;
> dp->data.conf = 0;
> if (dp->hpd) {
> - drm_connector_oob_hotplug_event(dp->connector_fwnode);
> + drm_connector_oob_hotplug_event(dp->connector_fwnode
Pretend that there is a comma at the end of the above line :-)
> + connector_status_disconnected);
> dp->hpd = false;
> sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
> }
> --
> 2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-10-12 1:27 ` Stephen Rothwell
@ 2023-10-12 7:09 ` Greg Kroah-Hartman
2023-10-20 2:00 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Greg Kroah-Hartman @ 2023-10-12 7:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, RD Babiera, Intel Graphics, DRI, Bjorn Andersson,
Bjorn Andersson, Dmitry Baryshkov, Linux Kernel Mailing List,
Linux Next Mailing List
On Thu, Oct 12, 2023 at 12:27:49PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event'
> > 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> > 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > from the usb.current tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> > drm_connector_oob_hotplug_event()"
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/usb/typec/altmodes/displayport.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> > dp->data.status = 0;
> > dp->data.conf = 0;
> > if (dp->hpd) {
> > - drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > + drm_connector_oob_hotplug_event(dp->connector_fwnode
>
> Pretend that there is a comma at the end of the above line :-)
Looks good to me, thanks!
greg k-h
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-10-12 1:27 ` Stephen Rothwell
2023-10-12 7:09 ` Greg Kroah-Hartman
@ 2023-10-20 2:00 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2023-10-20 2:00 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Greg Kroah-Hartman, RD Babiera, Intel Graphics,
DRI, Bjorn Andersson, Bjorn Andersson, Dmitry Baryshkov,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2698 bytes --]
Hi all,
On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event'
> > 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> > 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > from the usb.current tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> > drm_connector_oob_hotplug_event()"
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/usb/typec/altmodes/displayport.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> > dp->data.status = 0;
> > dp->data.conf = 0;
> > if (dp->hpd) {
> > - drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > + drm_connector_oob_hotplug_event(dp->connector_fwnode
>
> Pretend that there is a comma at the end of the above line :-)
>
> > + connector_status_disconnected);
> > dp->hpd = false;
> > sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
> > }
> > --
> > 2.40.1
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2023-08-07 1:36 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2023-08-07 1:36 UTC (permalink / raw)
To: Daniel Vetter
Cc: Danilo Krummrich, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_dmem.c: In function 'nouveau_dmem_migrate_chunk':
drivers/gpu/drm/nouveau/nouveau_dmem.c:681:43: error: 'chunk' undeclared (first use in this function)
681 | nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan);
| ^~~~~
Caused by commit
7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit")
I have used the drm-misc tree from next-20230804 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2023-04-03 2:16 Stephen Rothwell
2023-04-03 8:51 ` Qiang Yu
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2023-04-03 2:16 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Lucas Stach, Erico Nunes, Qiang Yu, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release':
drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
53 | mgr->elapsed_ns[i] += entity->elapsed_ns;
| ^~
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage':
drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
125 | usage[i] += entity->elapsed_ns;
| ^~
Caused by commit
bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
interacting with commit
baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")
from Linus' tree.
I can't see any obvious way to fix this up, so I have used teh drm-misc
tree from next-20230331 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-04-03 2:16 Stephen Rothwell
@ 2023-04-03 8:51 ` Qiang Yu
2023-04-04 1:14 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Qiang Yu @ 2023-04-03 8:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Lucas Stach, Erico Nunes,
Linux Kernel Mailing List, Linux Next Mailing List
I think you can just revert the following three lima commits when merge:
* 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats")
* 87767de835ed ("drm/lima: allocate unique id per drm_file")
* bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
Regards,
Qiang
On Mon, Apr 3, 2023 at 10:16 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release':
> drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
> 53 | mgr->elapsed_ns[i] += entity->elapsed_ns;
> | ^~
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage':
> drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
> 125 | usage[i] += entity->elapsed_ns;
> | ^~
>
> Caused by commit
>
> bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
>
> interacting with commit
>
> baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")
>
> from Linus' tree.
>
> I can't see any obvious way to fix this up, so I have used teh drm-misc
> tree from next-20230331 for today.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2023-04-03 8:51 ` Qiang Yu
@ 2023-04-04 1:14 ` Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2023-04-04 1:14 UTC (permalink / raw)
To: Qiang Yu
Cc: Daniel Vetter, Intel Graphics, DRI, Lucas Stach, Erico Nunes,
Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
Hi Qiang,
On Mon, 3 Apr 2023 16:51:27 +0800 Qiang Yu <yuq825@gmail.com> wrote:
>
> I think you can just revert the following three lima commits when merge:
> * 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats")
> * 87767de835ed ("drm/lima: allocate unique id per drm_file")
> * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
OK, I have done that from today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-11-17 7:32 Stephen Rothwell
2022-11-23 5:20 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-11-17 7:32 UTC (permalink / raw)
To: Daniel Vetter
Cc: Thomas Zimmermann, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2359 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
Caused by commit
0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
This build does not have CONFIG_VIDEO_NOMODESET set.
I applied the following patch for today.
From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/fb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3a822e4357b1..ea421724f733 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
#if defined(CONFIG_VIDEO_NOMODESET)
bool fb_modesetting_disabled(const char *drvname);
#else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
{
return false;
}
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-11-17 7:32 Stephen Rothwell
@ 2022-11-23 5:20 ` Stephen Rothwell
2022-11-23 5:35 ` David Airlie
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-11-23 5:20 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Thomas Zimmermann, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]
Hi all,
On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
> fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
> fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
> fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
> modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
> fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>
> Caused by commit
>
> 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
>
> This build does not have CONFIG_VIDEO_NOMODESET set.
>
> I applied the following patch for today.
>
> From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 17 Nov 2022 18:19:22 +1100
> Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/fb.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/fb.h b/include/linux/fb.h
> index 3a822e4357b1..ea421724f733 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
> #if defined(CONFIG_VIDEO_NOMODESET)
> bool fb_modesetting_disabled(const char *drvname);
> #else
> -bool fb_modesetting_disabled(const char *drvname)
> +static inline bool fb_modesetting_disabled(const char *drvname)
> {
> return false;
> }
> --
> 2.35.1
This commit went away for a couple of linux-next releases, but now has
reappeared in the drm tree :-( What went wrong?
I have reapplied the above patch...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-11-23 5:20 ` Stephen Rothwell
@ 2022-11-23 5:35 ` David Airlie
2022-11-23 6:22 ` Stephen Rothwell
2022-11-23 8:33 ` Thomas Zimmermann
0 siblings, 2 replies; 241+ messages in thread
From: David Airlie @ 2022-11-23 5:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Thomas Zimmermann, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Nov 23, 2022 at 3:21 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
> >
> > ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
> > fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
> > fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
> > fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
> > modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
> > fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> >
> > Caused by commit
> >
> > 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
> >
> > This build does not have CONFIG_VIDEO_NOMODESET set.
> >
> > I applied the following patch for today.
> >
> > From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 17 Nov 2022 18:19:22 +1100
> > Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > include/linux/fb.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/linux/fb.h b/include/linux/fb.h
> > index 3a822e4357b1..ea421724f733 100644
> > --- a/include/linux/fb.h
> > +++ b/include/linux/fb.h
> > @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
> > #if defined(CONFIG_VIDEO_NOMODESET)
> > bool fb_modesetting_disabled(const char *drvname);
> > #else
> > -bool fb_modesetting_disabled(const char *drvname)
> > +static inline bool fb_modesetting_disabled(const char *drvname)
> > {
> > return false;
> > }
> > --
> > 2.35.1
>
> This commit went away for a couple of linux-next releases, but now has
> reappeared in the drm tree :-( What went wrong?
Nothing gone wrong as such, just the drm-misc-next pull request was
sent on a regular weekly cadence, then I merged it a few days later.
The fix for this is still in the drm-misc-next queue for the next PR
which I will get this week.
Dave.
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-11-23 5:35 ` David Airlie
@ 2022-11-23 6:22 ` Stephen Rothwell
2022-11-23 8:33 ` Thomas Zimmermann
1 sibling, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2022-11-23 6:22 UTC (permalink / raw)
To: David Airlie
Cc: Daniel Vetter, Thomas Zimmermann, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
Hi Dave,
On Wed, 23 Nov 2022 15:35:50 +1000 David Airlie <airlied@redhat.com> wrote:
>
> Nothing gone wrong as such, just the drm-misc-next pull request was
> sent on a regular weekly cadence, then I merged it a few days later.
> The fix for this is still in the drm-misc-next queue for the next PR
> which I will get this week.
There is nothing currently in the drm-misc tree in linux-next (relative
to the drm tree). And there was never a fix in there for this problem,
the commit was just removed when I reported it.
If there was a fix for this in the drm-misc tree, I would not have seen
the build failure.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2022-11-23 5:35 ` David Airlie
2022-11-23 6:22 ` Stephen Rothwell
@ 2022-11-23 8:33 ` Thomas Zimmermann
1 sibling, 0 replies; 241+ messages in thread
From: Thomas Zimmermann @ 2022-11-23 8:33 UTC (permalink / raw)
To: David Airlie, Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 3485 bytes --]
Hi
Am 23.11.22 um 06:35 schrieb David Airlie:
> On Wed, Nov 23, 2022 at 3:21 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> After merging the drm-misc tree, today's linux-next build (powerpc
>>> ppc44x_defconfig) failed like this:
>>>
>>> ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
>>> fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>>> ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
>>> fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>>> ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
>>> fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>>> ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
>>> modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>>> ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
>>> fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>>>
>>> Caused by commit
>>>
>>> 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
>>>
>>> This build does not have CONFIG_VIDEO_NOMODESET set.
>>>
>>> I applied the following patch for today.
>>>
>>> From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Date: Thu, 17 Nov 2022 18:19:22 +1100
>>> Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"
>>>
>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>> ---
>>> include/linux/fb.h | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/include/linux/fb.h b/include/linux/fb.h
>>> index 3a822e4357b1..ea421724f733 100644
>>> --- a/include/linux/fb.h
>>> +++ b/include/linux/fb.h
>>> @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
>>> #if defined(CONFIG_VIDEO_NOMODESET)
>>> bool fb_modesetting_disabled(const char *drvname);
>>> #else
>>> -bool fb_modesetting_disabled(const char *drvname)
>>> +static inline bool fb_modesetting_disabled(const char *drvname)
>>> {
>>> return false;
>>> }
>>> --
>>> 2.35.1
>>
>> This commit went away for a couple of linux-next releases, but now has
>> reappeared in the drm tree :-( What went wrong?
>
> Nothing gone wrong as such, just the drm-misc-next pull request was
> sent on a regular weekly cadence, then I merged it a few days later.
> The fix for this is still in the drm-misc-next queue for the next PR
> which I will get this week.
The next PR should be drm-misc-next-fixes. FYI I forwarded the tree and
cherry-picked the patch from drm-misc-next.
Best regards
Thomas
>
> Dave.
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-11-16 0:38 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2022-11-16 0:38 UTC (permalink / raw)
To: Daniel Vetter
Cc: Maxime Ripard, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: modpost: missing MODULE_LICENSE() in drivers/gpu/drm/tests/drm_kunit_helpers.o
Caused by commit
44a3928324e9 ("drm/tests: Add Kunit Helpers")
I have used the drm-misc tree from next-20221115 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2022-11-10 0:10 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2022-11-10 0:10 UTC (permalink / raw)
To: Daniel Vetter, Dave Airlie
Cc: Ben Skeggs, Thomas Zimmermann, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_drm_probe':
drivers/gpu/drm/nouveau/nouveau_drm.c:797:17: error: implicit declaration of function 'drm_fbdev_generic_setup' [-Werror=implicit-function-declaration]
797 | drm_fbdev_generic_setup(drm_dev, 8);
| ^~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate source file")
interacting with commit
4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
from the drm tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 10 Nov 2022 11:05:52 +1100
Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move generic fbdev
emulation into separate source file"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index a19f18b251f3..80f154b6adab 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -34,6 +34,7 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_fbdev_generic.h>
#include <drm/drm_gem_ttm_helper.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_vblank.h>
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2022-10-21 0:02 Stephen Rothwell
2022-10-21 1:11 ` Zack Rusin
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-10-21 0:02 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Zack Rusin, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_display.c: In function 'nouveau_display_create':
drivers/gpu/drm/nouveau/nouveau_display.c:662:29: error: unused variable 'device' [-Werror=unused-variable]
662 | struct nvkm_device *device = nvxx_device(&drm->client.device);
| ^~~~~~
cc1: all warnings being treated as errors
Introduced by commit
7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
I have used the drm-misc tree from next-20221020 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-10-21 0:02 Stephen Rothwell
@ 2022-10-21 1:11 ` Zack Rusin
0 siblings, 0 replies; 241+ messages in thread
From: Zack Rusin @ 2022-10-21 1:11 UTC (permalink / raw)
To: sfr, dri-devel, daniel.vetter, intel-gfx; +Cc: linux-next, linux-kernel
On Fri, 2022-10-21 at 11:02 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_display.c: In function 'nouveau_display_create':
> drivers/gpu/drm/nouveau/nouveau_display.c:662:29: error: unused variable 'device' [-Werror=unused-variable]
> 662 | struct nvkm_device *device = nvxx_device(&drm->client.device);
> | ^~~~~~
> cc1: all warnings being treated as errors
>
> Introduced by commit
>
> 7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
>
> I have used the drm-misc tree from next-20221020 for today.
>
Hi, Stephen.
I've just sent out a trivial fix for this. I'm not sure how the bots and I missed
it. Thanks for letting me know!
z
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-06-21 2:36 Stephen Rothwell
2022-06-21 7:48 ` Ville Syrjälä
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-06-21 2:36 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Ville Syrjälä,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes':
drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration]
1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| drm_plane_create_scaling_filter_property
drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration]
1262 | drm_plane_create_alpha_property(&layer->plane);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| drm_plane_create_color_properties
cc1: all warnings being treated as errors
Presumably caused by one of the commits that dropped includes from
drm-ctrc.h.
I have used the drm-misc tree from next-20220620 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-06-21 2:36 Stephen Rothwell
@ 2022-06-21 7:48 ` Ville Syrjälä
2022-06-22 1:04 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Ville Syrjälä @ 2022-06-21 7:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes':
> drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration]
> 1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | drm_plane_create_scaling_filter_property
> drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration]
> 1262 | drm_plane_create_alpha_property(&layer->plane);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> | drm_plane_create_color_properties
> cc1: all warnings being treated as errors
>
> Presumably caused by one of the commits that dropped includes from
> drm-ctrc.h.
>
> I have used the drm-misc tree from next-20220620 for today.
Sorry about that. Looks like my .config was missing some
dependencies of the zynqmp driver so it wasn't getting built.
I'll cook up a fix.
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2022-06-21 7:48 ` Ville Syrjälä
@ 2022-06-22 1:04 ` Stephen Rothwell
2022-06-22 13:55 ` Ville Syrjälä
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-06-22 1:04 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 14014 bytes --]
Hi all,
On Tue, 21 Jun 2022 10:48:17 +0300 Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
>
> On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes':
> > drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration]
> > 1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > | drm_plane_create_scaling_filter_property
> > drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration]
> > 1262 | drm_plane_create_alpha_property(&layer->plane);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > | drm_plane_create_color_properties
> > cc1: all warnings being treated as errors
> >
> > Presumably caused by one of the commits that dropped includes from
> > drm-ctrc.h.
> >
> > I have used the drm-misc tree from next-20220620 for today.
>
> Sorry about that. Looks like my .config was missing some
> dependencies of the zynqmp driver so it wasn't getting built.
> I'll cook up a fix.
And today, I get these:
In file included from include/linux/list.h:5,
from include/linux/preempt.h:11,
from include/linux/spinlock.h:55,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:6,
from include/linux/mm.h:7,
from include/linux/hyperv.h:17,
from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6:
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_blit_to_vram_rect':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~
include/linux/container_of.h:18:33: note: in definition of macro 'container_of'
18 | void *__mptr = (void *)(ptr); \
| ^~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~~~~
In file included from include/linux/bits.h:22,
from include/linux/ratelimit_types.h:5,
from include/linux/printk.h:9,
from include/asm-generic/bug.h:22,
from arch/x86/include/asm/bug.h:87,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/mm.h:6,
from include/linux/hyperv.h:17,
from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6:
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
| ^~~~
include/linux/container_of.h:19:9: note: in expansion of macro 'static_assert'
19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~~~
include/linux/container_of.h:19:23: note: in expansion of macro '__same_type'
19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm.h:40:21: note: in expansion of macro 'container_of'
40 | #define to_hv(_dev) container_of(_dev, struct hyperv_drm_device, dev)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
| ^~~~
include/linux/container_of.h:19:9: note: in expansion of macro 'static_assert'
19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~~~
include/linux/container_of.h:20:23: note: in expansion of macro '__same_type'
20 | __same_type(*(ptr), void), \
| ^~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm.h:40:21: note: in expansion of macro 'container_of'
40 | #define to_hv(_dev) container_of(_dev, struct hyperv_drm_device, dev)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~~~~
include/linux/compiler_types.h:293:27: error: expression in static assertion is not an integer
293 | #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
| ^~~~
include/linux/container_of.h:19:9: note: in expansion of macro 'static_assert'
19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~~~
include/linux/container_of.h:19:23: note: in expansion of macro '__same_type'
19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm.h:40:21: note: in expansion of macro 'container_of'
40 | #define to_hv(_dev) container_of(_dev, struct hyperv_drm_device, dev)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv'
25 | struct hyperv_drm_device *hv = to_hv(fb->dev);
| ^~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:33:37: error: invalid use of undefined type 'struct drm_framebuffer'
33 | dst += drm_fb_clip_offset(fb->pitches[0], fb->format, rect);
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:33:53: error: invalid use of undefined type 'struct drm_framebuffer'
33 | dst += drm_fb_clip_offset(fb->pitches[0], fb->format, rect);
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:34:35: error: invalid use of undefined type 'struct drm_framebuffer'
34 | drm_fb_memcpy_toio(dst, fb->pitches[0], vmap, fb, rect);
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_blit_to_vram_fullscreen':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:46:25: error: invalid use of undefined type 'struct drm_framebuffer'
46 | .x2 = fb->width,
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:48:25: error: invalid use of undefined type 'struct drm_framebuffer'
48 | .y2 = fb->height,
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_connector_get_modes':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:58:17: error: implicit declaration of function 'drm_add_modes_noedid' [-Werror=implicit-function-declaration]
58 | count = drm_add_modes_noedid(connector,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:61:9: error: implicit declaration of function 'drm_set_preferred_mode'; did you mean 'drm_mm_reserve_node'? [-Werror=implicit-function-declaration]
61 | drm_set_preferred_mode(connector, hv->preferred_width,
| ^~~~~~~~~~~~~~~~~~~~~~
| drm_mm_reserve_node
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_check_size':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:93:27: error: invalid use of undefined type 'struct drm_framebuffer'
93 | pitch = fb->pitches[0];
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_pipe_enable':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:112:48: error: invalid use of undefined type 'struct drm_framebuffer'
112 | plane_state->fb->pitches[0]);
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_pipe_check':
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:123:15: error: invalid use of undefined type 'struct drm_framebuffer'
123 | if (fb->format->format != DRM_FORMAT_XRGB8888)
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:126:15: error: invalid use of undefined type 'struct drm_framebuffer'
126 | if (fb->pitches[0] * fb->height > hv->fb_size) {
| ^~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:126:32: error: invalid use of undefined type 'struct drm_framebuffer'
126 | if (fb->pitches[0] * fb->height > hv->fb_size) {
| ^~
In file included from include/linux/device.h:15,
from include/linux/hyperv.h:23,
from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6:
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:128:42: error: invalid use of undefined type 'struct drm_framebuffer'
128 | current->comm, fb->width, fb->height, fb->pitches[0], hv->fb_size);
| ^~
include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/drm/drm_print.h:425:9: note: in expansion of macro 'dev_err'
425 | dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
| ^~~~
include/drm/drm_print.h:438:9: note: in expansion of macro '__drm_printk'
438 | __drm_printk((drm), err,, "*ERROR* " fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:127:17: note: in expansion of macro 'drm_err'
127 | drm_err(&hv->dev, "fb size requested by %s for %dX%d (pitch %d) greater than %ld\n",
| ^~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:128:53: error: invalid use of undefined type 'struct drm_framebuffer'
128 | current->comm, fb->width, fb->height, fb->pitches[0], hv->fb_size);
| ^~
include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/drm/drm_print.h:425:9: note: in expansion of macro 'dev_err'
425 | dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
| ^~~~
include/drm/drm_print.h:438:9: note: in expansion of macro '__drm_printk'
438 | __drm_printk((drm), err,, "*ERROR* " fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:127:17: note: in expansion of macro 'drm_err'
127 | drm_err(&hv->dev, "fb size requested by %s for %dX%d (pitch %d) greater than %ld\n",
| ^~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:128:65: error: invalid use of undefined type 'struct drm_framebuffer'
128 | current->comm, fb->width, fb->height, fb->pitches[0], hv->fb_size);
| ^~
include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/drm/drm_print.h:425:9: note: in expansion of macro 'dev_err'
425 | dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
| ^~~~
include/drm/drm_print.h:438:9: note: in expansion of macro '__drm_printk'
438 | __drm_printk((drm), err,, "*ERROR* " fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~~
drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:127:17: note: in expansion of macro 'drm_err'
127 | drm_err(&hv->dev, "fb size requested by %s for %dX%d (pitch %d) greater than %ld\n",
| ^~~~~~~
cc1: all warnings being treated as errors
Please do some allmodconfig builds.
I have used the drm-misc tree from next-20220620 again for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-06-22 1:04 ` Stephen Rothwell
@ 2022-06-22 13:55 ` Ville Syrjälä
0 siblings, 0 replies; 241+ messages in thread
From: Ville Syrjälä @ 2022-06-22 13:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List
On Wed, Jun 22, 2022 at 11:04:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 21 Jun 2022 10:48:17 +0300 Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> >
> > On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes':
> > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration]
> > > 1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i);
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > | drm_plane_create_scaling_filter_property
> > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration]
> > > 1262 | drm_plane_create_alpha_property(&layer->plane);
> > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > | drm_plane_create_color_properties
> > > cc1: all warnings being treated as errors
> > >
> > > Presumably caused by one of the commits that dropped includes from
> > > drm-ctrc.h.
> > >
> > > I have used the drm-misc tree from next-20220620 for today.
> >
> > Sorry about that. Looks like my .config was missing some
> > dependencies of the zynqmp driver so it wasn't getting built.
> > I'll cook up a fix.
>
> And today, I get these:
>
> In file included from include/linux/list.h:5,
> from include/linux/preempt.h:11,
> from include/linux/spinlock.h:55,
> from include/linux/mmzone.h:8,
> from include/linux/gfp.h:6,
> from include/linux/mm.h:7,
> from include/linux/hyperv.h:17,
> from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6:
> drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_blit_to_vram_rect':
> drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer'
<snip>
> cc1: all warnings being treated as errors
>
> Please do some allmodconfig builds.
Ugh, I really wish kconfig had a reasonable way to enable exactly
the things I want rather than having to build absolutely everything...
Anyways, someone else beat me to a fix:
https://lists.freedesktop.org/archives/dri-devel/2022-June/360608.html
Sorry for the continued woes.
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-06-10 4:49 Stephen Rothwell
2022-06-10 9:23 ` Javier Martinez Canillas
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-06-10 4:49 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Javier Martinez Canillas, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or directory
29 | #include <asm/efi.h>
| ^~~~~~~~~~~
Caused by commit
fa0e256450f2 ("fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled")
$ find arch -name efi.h
arch/arm/include/asm/efi.h
arch/arm64/include/asm/efi.h
arch/ia64/include/asm/efi.h
arch/loongarch/include/asm/efi.h
arch/riscv/include/asm/efi.h
arch/x86/boot/compressed/efi.h
arch/x86/include/asm/efi.h
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-06-10 4:49 Stephen Rothwell
@ 2022-06-10 9:23 ` Javier Martinez Canillas
0 siblings, 0 replies; 241+ messages in thread
From: Javier Martinez Canillas @ 2022-06-10 9:23 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List
Hello Stephen,
On 6/10/22 06:49, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or directory
> 29 | #include <asm/efi.h>
> | ^~~~~~~~~~~
>
I noticed that this header include is not necessary so I posted [0] to
just drop it, and mentioned the build error too with your Reported-by.
> Caused by commit
>
> fa0e256450f2 ("fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled")
>
I posted a revert [1] for this but for a different reason (since after
[0] I believe the issue in powerpc should be fixed), which is that the
patch led to linking errors on arches that don't define a screen_info.
[0]: https://lkml.org/lkml/2022/6/10/323
[1]: https://lkml.org/lkml/2022/6/10/316
--
Best regards,
Javier Martinez Canillas
Linux Engineering
Red Hat
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-04-08 1:10 Stephen Rothwell
2022-04-08 8:17 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-04-08 1:10 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics, DRI, Christian König,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/drm/drm_gem.h:38,
from include/drm/ttm/ttm_bo_api.h:34,
from drivers/gpu/drm/i915/i915_deps.c:9:
drivers/gpu/drm/i915/i915_deps.c: In function 'i915_deps_add_resv':
drivers/gpu/drm/i915/i915_deps.c:229:46: error: implicit conversion from 'enum <anonymous>' to 'enum dma_resv_usage' [-Werror=enum-conversion]
229 | dma_resv_for_each_fence(&iter, resv, true, fence) {
| ^~~~
include/linux/dma-resv.h:297:47: note: in definition of macro 'dma_resv_for_each_fence'
297 | for (dma_resv_iter_begin(cursor, obj, usage), \
| ^~~~~
cc1: all warnings being treated as errors
Caused by commit
7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
I have used the drm-misc tree from next-20220407 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-04-08 1:10 Stephen Rothwell
@ 2022-04-08 8:17 ` Christian König
0 siblings, 0 replies; 241+ messages in thread
From: Christian König @ 2022-04-08 8:17 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Intel Graphics, DRI, Linux Kernel Mailing List, Linux Next Mailing List
Am 08.04.22 um 03:10 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/drm/drm_gem.h:38,
> from include/drm/ttm/ttm_bo_api.h:34,
> from drivers/gpu/drm/i915/i915_deps.c:9:
> drivers/gpu/drm/i915/i915_deps.c: In function 'i915_deps_add_resv':
> drivers/gpu/drm/i915/i915_deps.c:229:46: error: implicit conversion from 'enum <anonymous>' to 'enum dma_resv_usage' [-Werror=enum-conversion]
> 229 | dma_resv_for_each_fence(&iter, resv, true, fence) {
> | ^~~~
> include/linux/dma-resv.h:297:47: note: in definition of macro 'dma_resv_for_each_fence'
> 297 | for (dma_resv_iter_begin(cursor, obj, usage), \
> | ^~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
>
> I have used the drm-misc tree from next-20220407 for today.
That should be fixed by now.
Thanks,
Christian.
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2022-04-06 0:50 Stephen Rothwell
2022-04-06 8:56 ` Paul Cercueil
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2022-04-06 0:50 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christophe Branchereau, Paul Cercueil, Mark Brown,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1912 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
478 | .remove = nv3052c_remove,
| ^~~~~~~~~~~~~~
drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near initialization for 'nv3052c_driver.remove')
Caused by commit
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
interacting with commit
2cbfa2128662 ("spi: make remove callback a void function")
from Linus' tree (merged in v5.18-rc1).
I applied the following merge resolution patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Apr 2022 10:46:57 +1000
Subject: [PATCH] fixup for "spi: make remove callback a void function"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
index 127bcfdb59df..cf078f0d3cd3 100644
--- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
+++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
@@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi)
return 0;
}
-static int nv3052c_remove(struct spi_device *spi)
+static void nv3052c_remove(struct spi_device *spi)
{
struct nv3052c *priv = spi_get_drvdata(spi);
drm_panel_remove(&priv->panel);
drm_panel_disable(&priv->panel);
drm_panel_unprepare(&priv->panel);
-
- return 0;
}
static const struct drm_display_mode ltk035c5444t_modes[] = {
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2022-04-06 0:50 Stephen Rothwell
@ 2022-04-06 8:56 ` Paul Cercueil
0 siblings, 0 replies; 241+ messages in thread
From: Paul Cercueil @ 2022-04-06 8:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Christophe Branchereau,
Mark Brown, Linux Kernel Mailing List, Linux Next Mailing List
Hi Stephen,
Le mer., avril 6 2022 at 10:50:49 +1000, Stephen Rothwell
<sfr@canb.auug.org.au> a écrit :
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error:
> initialization of 'void (*)(struct spi_device *)' from incompatible
> pointer type 'int (*)(struct spi_device *)'
> [-Werror=incompatible-pointer-types]
> 478 | .remove = nv3052c_remove,
> | ^~~~~~~~~~~~~~
> drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near
> initialization for 'nv3052c_driver.remove')
>
> Caused by commit
>
> 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C
> based LCDs")
>
> interacting with commit
>
> 2cbfa2128662 ("spi: make remove callback a void function")
>
> from Linus' tree (merged in v5.18-rc1).
>
> I applied the following merge resolution patch for today.
Sorry about that, my fault.
I compile-tested Christophe's patchset *then* rebased to the latest
drm-misc-next and pushed, should have done the other way around.
-Paul
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 6 Apr 2022 10:46:57 +1000
> Subject: [PATCH] fixup for "spi: make remove callback a void function"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> index 127bcfdb59df..cf078f0d3cd3 100644
> --- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> +++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
> @@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi)
> return 0;
> }
>
> -static int nv3052c_remove(struct spi_device *spi)
> +static void nv3052c_remove(struct spi_device *spi)
> {
> struct nv3052c *priv = spi_get_drvdata(spi);
>
> drm_panel_remove(&priv->panel);
> drm_panel_disable(&priv->panel);
> drm_panel_unprepare(&priv->panel);
> -
> - return 0;
> }
>
> static const struct drm_display_mode ltk035c5444t_modes[] = {
> --
> 2.35.1
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-10-15 9:26 Stephen Rothwell
2021-10-15 9:56 ` Jani Nikula
2021-11-01 8:42 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2021-10-15 9:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
111 | static depot_stack_handle_t __stack_depot_save(void)
| ^~~~~~~~~~~~~~~~~~
In file included from include/linux/page_ext.h:7,
from include/linux/mm.h:25,
from include/linux/kallsyms.h:13,
from include/linux/bpf.h:20,
from include/linux/bpf-cgroup.h:5,
from include/linux/cgroup-defs.h:22,
from include/linux/cgroup.h:28,
from include/linux/memcontrol.h:13,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/drm_modeset_lock.c:24:
include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
| ^~~~~~~~~~~~~~~~~~
Caused by commit
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
This may only have been revealed because of another fix I have had to
apply today.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Oct 2021 20:17:52 +1100
Subject: [PATCH] drm/locking: fix for name conflict
Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 4d32b61fa1fd..ee36dd20900d 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -79,7 +79,7 @@
static DEFINE_WW_CLASS(crtc_ww_class);
#if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
-static noinline depot_stack_handle_t __stack_depot_save(void)
+static noinline depot_stack_handle_t __drm_stack_depot_save(void)
{
unsigned long entries[8];
unsigned int n;
@@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
kfree(buf);
}
#else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
-static depot_stack_handle_t __stack_depot_save(void)
+static depot_stack_handle_t __drm_stack_depot_save(void)
{
return 0;
}
@@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
ret = 0;
} else if (ret == -EDEADLK) {
ctx->contended = lock;
- ctx->stack_depot = __stack_depot_save();
+ ctx->stack_depot = __drm_stack_depot_save();
}
return ret;
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 Stephen Rothwell
@ 2021-10-15 9:56 ` Jani Nikula
2021-10-15 10:23 ` Stephen Rothwell
2021-11-01 8:42 ` Stephen Rothwell
1 sibling, 1 reply; 241+ messages in thread
From: Jani Nikula @ 2021-10-15 9:56 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Fri, 15 Oct 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
My bad, what was I thinking using stack depot's "namespace".
The fix looks good, but I'd rename __stack_depot_print too added in the
same commit. Do you want to respin or shall I take it from here?
Thanks,
Jani.
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:56 ` Jani Nikula
@ 2021-10-15 10:23 ` Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2021-10-15 10:23 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi Jani,
On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula <jani.nikula@intel.com> wrote:
>
> The fix looks good, but I'd rename __stack_depot_print too added in the
> same commit. Do you want to respin or shall I take it from here?
If you are happy to take it on, then thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 Stephen Rothwell
2021-10-15 9:56 ` Jani Nikula
@ 2021-11-01 8:42 ` Stephen Rothwell
2021-11-05 6:15 ` Stephen Rothwell
1 sibling, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-11-01 8:42 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3456 bytes --]
Hi all,
On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
This has reappeared today. I don't know what happened to the drm-misc
tree over the weeked :-(
I have reapplied the above fix.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-01 8:42 ` Stephen Rothwell
@ 2021-11-05 6:15 ` Stephen Rothwell
2021-11-05 11:03 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-11-05 6:15 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Jani Nikula,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]
Hi all,
On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> > | ^~~~~~~~~~~~~~~~~~
> > In file included from include/linux/page_ext.h:7,
> > from include/linux/mm.h:25,
> > from include/linux/kallsyms.h:13,
> > from include/linux/bpf.h:20,
> > from include/linux/bpf-cgroup.h:5,
> > from include/linux/cgroup-defs.h:22,
> > from include/linux/cgroup.h:28,
> > from include/linux/memcontrol.h:13,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from include/drm/drm_crtc.h:28,
> > from include/drm/drm_atomic.h:31,
> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> > | ^~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >
> > This may only have been revealed because of another fix I have had to
> > apply today.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> > Subject: [PATCH] drm/locking: fix for name conflict
> >
> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> > index 4d32b61fa1fd..ee36dd20900d 100644
> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> > @@ -79,7 +79,7 @@
> > static DEFINE_WW_CLASS(crtc_ww_class);
> >
> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > unsigned long entries[8];
> > unsigned int n;
> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> > kfree(buf);
> > }
> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> > -static depot_stack_handle_t __stack_depot_save(void)
> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > return 0;
> > }
> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> > ret = 0;
> > } else if (ret == -EDEADLK) {
> > ctx->contended = lock;
> > - ctx->stack_depot = __stack_depot_save();
> > + ctx->stack_depot = __drm_stack_depot_save();
> > }
> >
> > return ret;
>
> This has reappeared today. I don't know what happened to the drm-misc
> tree over the weeked :-(
>
> I have reapplied the above fix.
So the above drm-misc commit is now in the drm tree, but its fix up
commit vanished from the drm-misc tree over the past weekend :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 6:15 ` Stephen Rothwell
@ 2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:57 ` Maxime Ripard
2021-11-06 2:33 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Jani Nikula @ 2021-11-05 11:03 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann, Maarten Lankhorst,
Maxime Ripard
On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
>> > 111 | static depot_stack_handle_t __stack_depot_save(void)
>> > | ^~~~~~~~~~~~~~~~~~
>> > In file included from include/linux/page_ext.h:7,
>> > from include/linux/mm.h:25,
>> > from include/linux/kallsyms.h:13,
>> > from include/linux/bpf.h:20,
>> > from include/linux/bpf-cgroup.h:5,
>> > from include/linux/cgroup-defs.h:22,
>> > from include/linux/cgroup.h:28,
>> > from include/linux/memcontrol.h:13,
>> > from include/linux/swap.h:9,
>> > from include/linux/suspend.h:5,
>> > from include/linux/regulator/consumer.h:35,
>> > from include/linux/i2c.h:18,
>> > from include/drm/drm_crtc.h:28,
>> > from include/drm/drm_atomic.h:31,
>> > from drivers/gpu/drm/drm_modeset_lock.c:24:
>> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
>> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
>> > | ^~~~~~~~~~~~~~~~~~
>> >
>> > Caused by commit
>> >
>> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> >
>> > This may only have been revealed because of another fix I have had to
>> > apply today.
>> >
>> > I have applied the following patch for today.
>> >
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Fri, 15 Oct 2021 20:17:52 +1100
>> > Subject: [PATCH] drm/locking: fix for name conflict
>> >
>> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> > ---
>> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>> > index 4d32b61fa1fd..ee36dd20900d 100644
>> > --- a/drivers/gpu/drm/drm_modeset_lock.c
>> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> > @@ -79,7 +79,7 @@
>> > static DEFINE_WW_CLASS(crtc_ww_class);
>> >
>> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
>> > -static noinline depot_stack_handle_t __stack_depot_save(void)
>> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > unsigned long entries[8];
>> > unsigned int n;
>> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
>> > kfree(buf);
>> > }
>> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
>> > -static depot_stack_handle_t __stack_depot_save(void)
>> > +static depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > return 0;
>> > }
>> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
>> > ret = 0;
>> > } else if (ret == -EDEADLK) {
>> > ctx->contended = lock;
>> > - ctx->stack_depot = __stack_depot_save();
>> > + ctx->stack_depot = __drm_stack_depot_save();
>> > }
>> >
>> > return ret;
>>
>> This has reappeared today. I don't know what happened to the drm-misc
>> tree over the weeked :-(
>>
>> I have reapplied the above fix.
>
> So the above drm-misc commit is now in the drm tree, but its fix up
> commit vanished from the drm-misc tree over the past weekend :-(
Cc: drm-misc maintainers.
We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
drm-misc-next-fixes during the merge window. This is because
drm-misc-next already starts accumulating stuff that's headed to one
release later, e.g. currently v5.17. I think that's part of the reason.
I probably should have pushed c4f08d7246a5 ("drm/locking: fix
__stack_depot_* name conflict") to drm-misc-next-fixes.
There's still something funny going on, because the drm-misc-next pull
request [1] isn't part of the drm pull request for v5.16 [2]. Is there
going to be another drm pull?
BR,
Jani.
[1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour
[2] https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_Vp6ww@mail.gmail.com
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 11:03 ` Jani Nikula
@ 2021-11-05 11:57 ` Maxime Ripard
2021-11-06 2:33 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Maxime Ripard @ 2021-11-05 11:57 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann, Maarten Lankhorst
[-- Attachment #1: Type: text/plain, Size: 5101 bytes --]
Hi,
On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote:
> On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> >
> >> > After merging the drm-misc tree, today's linux-next build (arm
> >> > multi_v7_defconfig) failed like this:
> >> >
> >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> >> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> >> > | ^~~~~~~~~~~~~~~~~~
> >> > In file included from include/linux/page_ext.h:7,
> >> > from include/linux/mm.h:25,
> >> > from include/linux/kallsyms.h:13,
> >> > from include/linux/bpf.h:20,
> >> > from include/linux/bpf-cgroup.h:5,
> >> > from include/linux/cgroup-defs.h:22,
> >> > from include/linux/cgroup.h:28,
> >> > from include/linux/memcontrol.h:13,
> >> > from include/linux/swap.h:9,
> >> > from include/linux/suspend.h:5,
> >> > from include/linux/regulator/consumer.h:35,
> >> > from include/linux/i2c.h:18,
> >> > from include/drm/drm_crtc.h:28,
> >> > from include/drm/drm_atomic.h:31,
> >> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> >> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> >> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> >> > | ^~~~~~~~~~~~~~~~~~
> >> >
> >> > Caused by commit
> >> >
> >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> >
> >> > This may only have been revealed because of another fix I have had to
> >> > apply today.
> >> >
> >> > I have applied the following patch for today.
> >> >
> >> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> >> > Subject: [PATCH] drm/locking: fix for name conflict
> >> >
> >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > ---
> >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> >> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> >> > index 4d32b61fa1fd..ee36dd20900d 100644
> >> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> >> > @@ -79,7 +79,7 @@
> >> > static DEFINE_WW_CLASS(crtc_ww_class);
> >> >
> >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> >> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > unsigned long entries[8];
> >> > unsigned int n;
> >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> >> > kfree(buf);
> >> > }
> >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> >> > -static depot_stack_handle_t __stack_depot_save(void)
> >> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > return 0;
> >> > }
> >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> >> > ret = 0;
> >> > } else if (ret == -EDEADLK) {
> >> > ctx->contended = lock;
> >> > - ctx->stack_depot = __stack_depot_save();
> >> > + ctx->stack_depot = __drm_stack_depot_save();
> >> > }
> >> >
> >> > return ret;
> >>
> >> This has reappeared today. I don't know what happened to the drm-misc
> >> tree over the weeked :-(
> >>
> >> I have reapplied the above fix.
> >
> > So the above drm-misc commit is now in the drm tree, but its fix up
> > commit vanished from the drm-misc tree over the past weekend :-(
>
> Cc: drm-misc maintainers.
>
> We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
> drm-misc-next-fixes during the merge window. This is because
> drm-misc-next already starts accumulating stuff that's headed to one
> release later, e.g. currently v5.17. I think that's part of the reason.
Indeed
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> There's still something funny going on, because the drm-misc-next pull
> request [1] isn't part of the drm pull request for v5.16 [2]. Is there
> going to be another drm pull?
The last drm-misc-next PR for some reason didn't got logged into
patchwork, and Dave missed it.
We found out yesterday, and he pulled it today so I assume there will be
a second PR with that last PR and today's drm-misc-next-fixes PR.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:57 ` Maxime Ripard
@ 2021-11-06 2:33 ` Stephen Rothwell
2021-11-09 7:40 ` Jani Nikula
1 sibling, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-11-06 2:33 UTC (permalink / raw)
To: Jani Nikula
Cc: Dave Airlie, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann, Maarten Lankhorst, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
Hi Jani,
On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
Please do so as builds will start failing otherwise :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-06 2:33 ` Stephen Rothwell
@ 2021-11-09 7:40 ` Jani Nikula
2021-11-09 9:16 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Jani Nikula @ 2021-11-09 7:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jani,
>
> On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>>
>> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> Please do so as builds will start failing otherwise :-(
Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-09 7:40 ` Jani Nikula
@ 2021-11-09 9:16 ` Daniel Vetter
2021-11-09 11:09 ` Jani Nikula
0 siblings, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2021-11-09 9:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Jani,
> >
> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
> >>
> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
> >
> > Please do so as builds will start failing otherwise :-(
>
> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
Yeah just do, for drm-misc this is considered in committer purview. I
think we should add a section to the docs about "What if a patch is in the
wrong branch" which tells you to just cherry-pick -x or whatever.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-09 9:16 ` Daniel Vetter
@ 2021-11-09 11:09 ` Jani Nikula
0 siblings, 0 replies; 241+ messages in thread
From: Jani Nikula @ 2021-11-09 11:09 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Tue, 09 Nov 2021, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
>> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi Jani,
>> >
>> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>> >>
>> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
>> >
>> > Please do so as builds will start failing otherwise :-(
>>
>> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
>
> Yeah just do, for drm-misc this is considered in committer purview. I
> think we should add a section to the docs about "What if a patch is in the
> wrong branch" which tells you to just cherry-pick -x or whatever.
Done.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-10-12 2:18 Stephen Rothwell
2021-10-12 11:29 ` Karol Herbst
[not found] ` <202110141102364478237@zte.com.cn>
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2021-10-12 2:18 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Karol Herbst, Luo penghao, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function 'gp100_vmm_fault_cancel':
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused variable 'inst' [-Werror=unused-variable]
491 | u32 inst, aper;
| ^~~~
cc1: all warnings being treated as errors
Caused by commit
404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if condition.")
I have used the drm-misc tree from next-20211011 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-12 2:18 Stephen Rothwell
@ 2021-10-12 11:29 ` Karol Herbst
[not found] ` <202110141102364478237@zte.com.cn>
1 sibling, 0 replies; 241+ messages in thread
From: Karol Herbst @ 2021-10-12 11:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Luo penghao,
Linux Kernel Mailing List, Linux Next Mailing List
uhh, that's on me. I will send out a patch today. I just noticed that
the config file I used for testing had WERROR disabled.
On Tue, Oct 12, 2021 at 4:18 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function 'gp100_vmm_fault_cancel':
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused variable 'inst' [-Werror=unused-variable]
> 491 | u32 inst, aper;
> | ^~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if condition.")
>
> I have used the drm-misc tree from next-20211011 for today.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread[parent not found: <202110141102364478237@zte.com.cn>]
* Re: linux-next: build failure after merge of the drm-misc tree
[not found] ` <202110141102364478237@zte.com.cn>
@ 2021-10-14 5:42 ` Karol Herbst
0 siblings, 0 replies; 241+ messages in thread
From: Karol Herbst @ 2021-10-14 5:42 UTC (permalink / raw)
To: Luo penghao
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics Development,
dri-devel, LKML, Linux Next Mailing List
On Thu, Oct 14, 2021 at 5:02 AM <luo.penghao@zte.com.cn> wrote:
>
> Hi,
>
> I review the code.
>
> It seems I forget to delete the definition of the variable "inst",I'm sry for that.: (
>
> I'll submit another patch soon.
>
I already wrote the patch and pushed it:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit?id=381ba6a6baf104b572379c6b2deab884555104d4
>
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function 'gp100_vmm_fault_cancel':
> > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused variable 'inst' [-Werror=unused-variable]
> > 491 | u32 inst, aper;
> > | ^~~~
> > cc1: all warnings being treated as errors
> >
> > Caused by commit
> >
> > 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if condition.")
> >
> > I have used the drm-misc tree from next-20211011 for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-09-17 7:09 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2021-09-17 7:09 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Maxime Ripard, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
modules_install) failed like this:
depmod: ERROR: Cycle detected: drm_kms_helper -> drm -> drm_kms_helper
depmod: ERROR: Cycle detected: cec
depmod: ERROR: Found 2 modules in dependency cycles!
Caused by commit
87ea95808d53 ("drm/bridge: Add a function to abstract away panels")
I have reverted these commits for today:
a43dd76bacd0 ("drm/vc4: dsi: Switch to devm_drm_of_get_bridge")
0caddbbfdfa2 ("drm/vc4: dpi: Switch to devm_drm_of_get_bridge")
87ea95808d53 ("drm/bridge: Add a function to abstract away panels")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2021-06-08 2:50 Stephen Rothwell
2021-06-08 5:37 ` Felix Kuehling
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-06-08 2:50 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, Dave Airlie, DRI
Cc: Alex Deucher, Felix Kuehling, Christian König,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2503 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function 'amdgpu_preempt_mgr_new':
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct ttm_resource' has no member named 'mm_node'
75 | mem->mm_node = NULL;
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource **)' from incompatible pointer type 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types]
129 | .alloc = amdgpu_preempt_mgr_new,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near initialization for 'amdgpu_preempt_mgr_func.alloc')
Caused by commit
cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
from the drm-misc tree interacting with commit
b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
from the drm tree.
I don't know how to fix this, so I added the following hack (a better
fix would be nice):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jun 2021 12:41:16 +1000
Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
index d607f314cc1b..e1a7b3e967b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
@@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
struct ttm_buffer_object *tbo,
const struct ttm_place *place,
- struct ttm_resource *mem)
+ struct ttm_resource **res)
{
+#if 0
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
atomic64_add(mem->num_pages, &mgr->used);
mem->mm_node = NULL;
mem->start = AMDGPU_BO_INVALID_OFFSET;
+#endif
return 0;
}
--
2.30.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-08 2:50 Stephen Rothwell
@ 2021-06-08 5:37 ` Felix Kuehling
2021-06-08 6:55 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Felix Kuehling @ 2021-06-08 5:37 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, Dave Airlie,
DRI, Christian König
Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List
Hi Christian,
I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
changed there. Looks like I'll need to create a dummy node in
amdgpu_preempt_mgr_new to satisfy TTM, and free it in
amdgpu_preempt_mgr_del.
Thanks,
Felix
Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function 'amdgpu_preempt_mgr_new':
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct ttm_resource' has no member named 'mm_node'
> 75 | mem->mm_node = NULL;
> | ^~
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource **)' from incompatible pointer type 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types]
> 129 | .alloc = amdgpu_preempt_mgr_new,
> | ^~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near initialization for 'amdgpu_preempt_mgr_func.alloc')
>
> Caused by commit
>
> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
>
> from the drm-misc tree interacting with commit
>
> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
>
> from the drm tree.
>
> I don't know how to fix this, so I added the following hack (a better
> fix would be nice):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Jun 2021 12:41:16 +1000
> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> index d607f314cc1b..e1a7b3e967b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
> struct ttm_buffer_object *tbo,
> const struct ttm_place *place,
> - struct ttm_resource *mem)
> + struct ttm_resource **res)
> {
> +#if 0
> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>
> atomic64_add(mem->num_pages, &mgr->used);
>
> mem->mm_node = NULL;
> mem->start = AMDGPU_BO_INVALID_OFFSET;
> +#endif
> return 0;
> }
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-08 5:37 ` Felix Kuehling
@ 2021-06-08 6:55 ` Christian König
2021-06-08 7:06 ` Felix Kuehling
0 siblings, 1 reply; 241+ messages in thread
From: Christian König @ 2021-06-08 6:55 UTC (permalink / raw)
To: Felix Kuehling, Stephen Rothwell, Daniel Vetter, Intel Graphics,
Dave Airlie, DRI
Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List
Hi Felix,
that should already be fixed in drm-tip as part of the merge of the TTM
changes.
Regards,
Christian.
Am 08.06.21 um 07:37 schrieb Felix Kuehling:
> Hi Christian,
>
> I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
> changed there. Looks like I'll need to create a dummy node in
> amdgpu_preempt_mgr_new to satisfy TTM, and free it in
> amdgpu_preempt_mgr_del.
>
> Thanks,
> Felix
>
>
> Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function 'amdgpu_preempt_mgr_new':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct ttm_resource' has no member named 'mm_node'
>> 75 | mem->mm_node = NULL;
>> | ^~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource **)' from incompatible pointer type 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types]
>> 129 | .alloc = amdgpu_preempt_mgr_new,
>> | ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near initialization for 'amdgpu_preempt_mgr_func.alloc')
>>
>> Caused by commit
>>
>> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
>>
>> from the drm-misc tree interacting with commit
>>
>> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
>>
>> from the drm tree.
>>
>> I don't know how to fix this, so I added the following hack (a better
>> fix would be nice):
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 8 Jun 2021 12:41:16 +1000
>> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>> index d607f314cc1b..e1a7b3e967b9 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
>> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>> struct ttm_buffer_object *tbo,
>> const struct ttm_place *place,
>> - struct ttm_resource *mem)
>> + struct ttm_resource **res)
>> {
>> +#if 0
>> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>>
>> atomic64_add(mem->num_pages, &mgr->used);
>>
>> mem->mm_node = NULL;
>> mem->start = AMDGPU_BO_INVALID_OFFSET;
>> +#endif
>> return 0;
>> }
>>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-08 6:55 ` Christian König
@ 2021-06-08 7:06 ` Felix Kuehling
2021-06-08 7:11 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Felix Kuehling @ 2021-06-08 7:06 UTC (permalink / raw)
To: Christian König, Stephen Rothwell, Daniel Vetter,
Intel Graphics, Dave Airlie, DRI
Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List
Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
> Hi Felix,
>
> that should already be fixed in drm-tip as part of the merge of the
> TTM changes.
No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
drm-next, but that doesn't seem to have the TTM changes yet.
Is there another DRM branch or repository that you're referring to with
drm-tip?
Regards,
Felix
>
> Regards,
> Christian.
>
> Am 08.06.21 um 07:37 schrieb Felix Kuehling:
>> Hi Christian,
>>
>> I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
>> changed there. Looks like I'll need to create a dummy node in
>> amdgpu_preempt_mgr_new to satisfy TTM, and free it in
>> amdgpu_preempt_mgr_del.
>>
>> Thanks,
>> Felix
>>
>>
>> Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
>>> Hi all,
>>>
>>> After merging the drm-misc tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
>>> 'amdgpu_preempt_mgr_new':
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
>>> ttm_resource' has no member named 'mm_node'
>>> 75 | mem->mm_node = NULL;
>>> | ^~
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
>>> initialization of 'int (*)(struct ttm_resource_manager *, struct
>>> ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
>>> **)' from incompatible pointer type 'int (*)(struct
>>> ttm_resource_manager *, struct ttm_buffer_object *, const struct
>>> ttm_place *, struct ttm_resource *)'
>>> [-Werror=incompatible-pointer-types]
>>> 129 | .alloc = amdgpu_preempt_mgr_new,
>>> | ^~~~~~~~~~~~~~~~~~~~~~
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
>>> initialization for 'amdgpu_preempt_mgr_func.alloc')
>>>
>>> Caused by commit
>>>
>>> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
>>> resources v2")
>>>
>>> from the drm-misc tree interacting with commit
>>>
>>> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
>>> BOs")
>>>
>>> from the drm tree.
>>>
>>> I don't know how to fix this, so I added the following hack (a better
>>> fix would be nice):
>>>
>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Date: Tue, 8 Jun 2021 12:41:16 +1000
>>> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>>>
>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> index d607f314cc1b..e1a7b3e967b9 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
>>> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>>> struct ttm_buffer_object *tbo,
>>> const struct ttm_place *place,
>>> - struct ttm_resource *mem)
>>> + struct ttm_resource **res)
>>> {
>>> +#if 0
>>> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>>> atomic64_add(mem->num_pages, &mgr->used);
>>> mem->mm_node = NULL;
>>> mem->start = AMDGPU_BO_INVALID_OFFSET;
>>> +#endif
>>> return 0;
>>> }
>>>
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-08 7:06 ` Felix Kuehling
@ 2021-06-08 7:11 ` Christian König
2021-06-09 13:48 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Christian König @ 2021-06-08 7:11 UTC (permalink / raw)
To: Felix Kuehling, Stephen Rothwell, Daniel Vetter, Intel Graphics,
Dave Airlie, DRI, Daniel Vetter
Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List
Am 08.06.21 um 09:06 schrieb Felix Kuehling:
> Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
>> Hi Felix,
>>
>> that should already be fixed in drm-tip as part of the merge of the
>> TTM changes.
> No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
> drm-next, but that doesn't seem to have the TTM changes yet.
>
> Is there another DRM branch or repository that you're referring to with
> drm-tip?
drm-tip is an integration branch for conflict resolution.
E.g. when we have changes in drm-misc-next which break when we merge
with drm-next I'm informed and need to provide a conflict resolution patch.
This is automatically applied when drm-next and drm-misc-next are merged
together again.
It just looks like that drm-next and drm-misc-next are merged manually
into linux-next and then the conflict resolution doesn't apply and
everything breaks into pieces.
Adding Daniel as well. How should that be handled? Should we merge
drm-misc-next into drm-next now?
Thanks,
Christian.
>
> Regards,
> Fel
>
>> Regards,
>> Christian.
>>
>> Am 08.06.21 um 07:37 schrieb Felix Kuehling:
>>> Hi Christian,
>>>
>>> I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
>>> changed there. Looks like I'll need to create a dummy node in
>>> amdgpu_preempt_mgr_new to satisfy TTM, and free it in
>>> amdgpu_preempt_mgr_del.
>>>
>>> Thanks,
>>> Felix
>>>
>>>
>>> Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
>>>> Hi all,
>>>>
>>>> After merging the drm-misc tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
>>>> 'amdgpu_preempt_mgr_new':
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
>>>> ttm_resource' has no member named 'mm_node'
>>>> 75 | mem->mm_node = NULL;
>>>> | ^~
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
>>>> initialization of 'int (*)(struct ttm_resource_manager *, struct
>>>> ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
>>>> **)' from incompatible pointer type 'int (*)(struct
>>>> ttm_resource_manager *, struct ttm_buffer_object *, const struct
>>>> ttm_place *, struct ttm_resource *)'
>>>> [-Werror=incompatible-pointer-types]
>>>> 129 | .alloc = amdgpu_preempt_mgr_new,
>>>> | ^~~~~~~~~~~~~~~~~~~~~~
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
>>>> initialization for 'amdgpu_preempt_mgr_func.alloc')
>>>>
>>>> Caused by commit
>>>>
>>>> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
>>>> resources v2")
>>>>
>>>> from the drm-misc tree interacting with commit
>>>>
>>>> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
>>>> BOs")
>>>>
>>>> from the drm tree.
>>>>
>>>> I don't know how to fix this, so I added the following hack (a better
>>>> fix would be nice):
>>>>
>>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>>> Date: Tue, 8 Jun 2021 12:41:16 +1000
>>>> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>>>>
>>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>>> ---
>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
>>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>>> index d607f314cc1b..e1a7b3e967b9 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>>> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
>>>> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>>>> struct ttm_buffer_object *tbo,
>>>> const struct ttm_place *place,
>>>> - struct ttm_resource *mem)
>>>> + struct ttm_resource **res)
>>>> {
>>>> +#if 0
>>>> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>>>> atomic64_add(mem->num_pages, &mgr->used);
>>>> mem->mm_node = NULL;
>>>> mem->start = AMDGPU_BO_INVALID_OFFSET;
>>>> +#endif
>>>> return 0;
>>>> }
>>>>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-08 7:11 ` Christian König
@ 2021-06-09 13:48 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2021-06-09 13:48 UTC (permalink / raw)
To: Christian König
Cc: Felix Kuehling, Stephen Rothwell, Daniel Vetter, Intel Graphics,
Dave Airlie, DRI, Daniel Vetter, Alex Deucher,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Jun 08, 2021 at 09:11:57AM +0200, Christian König wrote:
> Am 08.06.21 um 09:06 schrieb Felix Kuehling:
> > Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
> > > Hi Felix,
> > >
> > > that should already be fixed in drm-tip as part of the merge of the
> > > TTM changes.
> > No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
> > drm-next, but that doesn't seem to have the TTM changes yet.
> >
> > Is there another DRM branch or repository that you're referring to with
> > drm-tip?
>
> drm-tip is an integration branch for conflict resolution.
>
> E.g. when we have changes in drm-misc-next which break when we merge with
> drm-next I'm informed and need to provide a conflict resolution patch.
>
> This is automatically applied when drm-next and drm-misc-next are merged
> together again.
>
> It just looks like that drm-next and drm-misc-next are merged manually into
> linux-next and then the conflict resolution doesn't apply and everything
> breaks into pieces.
>
> Adding Daniel as well. How should that be handled? Should we merge
> drm-misc-next into drm-next now?
Yeah I'm expecting there will be a pull request this week. I've given Dave
Airlie a headsup that the conflict is "interesting" and that maybe he
needs to push out a test branch for you and Thomas Hellstrom to
review/test first.
-Daniel
>
> Thanks,
> Christian.
>
> >
> > Regards,
> > Fel
> >
> > > Regards,
> > > Christian.
> > >
> > > Am 08.06.21 um 07:37 schrieb Felix Kuehling:
> > > > Hi Christian,
> > > >
> > > > I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
> > > > changed there. Looks like I'll need to create a dummy node in
> > > > amdgpu_preempt_mgr_new to satisfy TTM, and free it in
> > > > amdgpu_preempt_mgr_del.
> > > >
> > > > Thanks,
> > > > Felix
> > > >
> > > >
> > > > Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
> > > > > Hi all,
> > > > >
> > > > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > > > allmodconfig) failed like this:
> > > > >
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
> > > > > 'amdgpu_preempt_mgr_new':
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
> > > > > ttm_resource' has no member named 'mm_node'
> > > > > 75 | mem->mm_node = NULL;
> > > > > | ^~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
> > > > > initialization of 'int (*)(struct ttm_resource_manager *, struct
> > > > > ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
> > > > > **)' from incompatible pointer type 'int (*)(struct
> > > > > ttm_resource_manager *, struct ttm_buffer_object *, const struct
> > > > > ttm_place *, struct ttm_resource *)'
> > > > > [-Werror=incompatible-pointer-types]
> > > > > 129 | .alloc = amdgpu_preempt_mgr_new,
> > > > > | ^~~~~~~~~~~~~~~~~~~~~~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
> > > > > initialization for 'amdgpu_preempt_mgr_func.alloc')
> > > > >
> > > > > Caused by commit
> > > > >
> > > > > cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
> > > > > resources v2")
> > > > >
> > > > > from the drm-misc tree interacting with commit
> > > > >
> > > > > b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
> > > > > BOs")
> > > > >
> > > > > from the drm tree.
> > > > >
> > > > > I don't know how to fix this, so I added the following hack (a better
> > > > > fix would be nice):
> > > > >
> > > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > > Date: Tue, 8 Jun 2021 12:41:16 +1000
> > > > > Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
> > > > >
> > > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > > ---
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
> > > > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > index d607f314cc1b..e1a7b3e967b9 100644
> > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
> > > > > static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
> > > > > struct ttm_buffer_object *tbo,
> > > > > const struct ttm_place *place,
> > > > > - struct ttm_resource *mem)
> > > > > + struct ttm_resource **res)
> > > > > {
> > > > > +#if 0
> > > > > struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> > > > > atomic64_add(mem->num_pages, &mgr->used);
> > > > > mem->mm_node = NULL;
> > > > > mem->start = AMDGPU_BO_INVALID_OFFSET;
> > > > > +#endif
> > > > > return 0;
> > > > > }
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-06-07 2:33 Stephen Rothwell
2021-06-07 6:39 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-06-07 2:33 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/infiniband/core/umem_dmabuf.c: In function 'ib_umem_dmabuf_map_pages':
drivers/infiniband/core/umem_dmabuf.c:69:10: error: implicit declaration of function 'dma_resv_get_excl'; did you mean 'dma_resv_get_fences'? [-Werror=implicit-function-declaration]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
| ^~~~~~~~~~~~~~~~~
| dma_resv_get_fences
drivers/infiniband/core/umem_dmabuf.c:69:8: warning: assignment to 'struct dma_fence *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
| ^
Caused by commit
6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3")
I have used the drm-misc tree from next-20210604 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-06-07 2:33 Stephen Rothwell
@ 2021-06-07 6:39 ` Christian König
0 siblings, 0 replies; 241+ messages in thread
From: Christian König @ 2021-06-07 6:39 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Ah, yes. I've forgot to include the infiniband subdir in the automated
rename. I should have done that treewide.
Going to provide a fix in a minute, sorry for the noise.
Christian.
Am 07.06.21 um 04:33 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/infiniband/core/umem_dmabuf.c: In function 'ib_umem_dmabuf_map_pages':
> drivers/infiniband/core/umem_dmabuf.c:69:10: error: implicit declaration of function 'dma_resv_get_excl'; did you mean 'dma_resv_get_fences'? [-Werror=implicit-function-declaration]
> 69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
> | ^~~~~~~~~~~~~~~~~
> | dma_resv_get_fences
> drivers/infiniband/core/umem_dmabuf.c:69:8: warning: assignment to 'struct dma_fence *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
> | ^
>
> Caused by commit
>
> 6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3")
>
> I have used the drm-misc tree from next-20210604 for today.
>
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-05-12 5:00 Stephen Rothwell
2021-05-12 18:58 ` Thomas Zimmermann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-05-12 5:00 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Thomas Zimmermann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_connector.c: In function 'nouveau_connector_of_detect':
drivers/gpu/drm/nouveau/nouveau_connector.c:463:59: error: 'struct drm_device' has no member named 'pdev'; did you mean 'dev'?
463 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
| ^~~~
| dev
Caused by commit
b347e04452ff ("drm: Remove pdev field from struct drm_device")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-05-12 5:00 Stephen Rothwell
@ 2021-05-12 18:58 ` Thomas Zimmermann
0 siblings, 0 replies; 241+ messages in thread
From: Thomas Zimmermann @ 2021-05-12 18:58 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1269 bytes --]
Hi
Am 12.05.21 um 07:00 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_connector.c: In function 'nouveau_connector_of_detect':
> drivers/gpu/drm/nouveau/nouveau_connector.c:463:59: error: 'struct drm_device' has no member named 'pdev'; did you mean 'dev'?
> 463 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
> | ^~~~
> | dev
>
> Caused by commit
>
> b347e04452ff ("drm: Remove pdev field from struct drm_device")
>
> I have reverted that commit for today.
>
Thanks for reporting. pdev is gone, but the references are sometimes
hard to find. You may want to undo the revert and try the fix at [1].
The patch should hit drm-misc-next ASAP.
Best regards
Thomas
[1]
https://lore.kernel.org/dri-devel/20210512185527.26050-1-tzimmermann@suse.de/T/#u
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-02-10 3:11 Stephen Rothwell
2021-02-10 14:31 ` Maarten Lankhorst
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-02-10 3:11 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Luben Tuikov, Maarten Lankhorst,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 5059 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete type
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in function returning void [-Werror=return-type]
289 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in function returning void [-Werror=return-type]
309 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type
316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type
325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type
334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in function returning void [-Werror=return-type]
353 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
362 | .timedout_job = v3d_bin_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 'v3d_bin_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
369 | .timedout_job = v3d_render_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 'v3d_render_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
376 | .timedout_job = v3d_generic_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 'v3d_tfu_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
383 | .timedout_job = v3d_csd_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 'v3d_csd_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
390 | .timedout_job = v3d_generic_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job')
Caused by commit
c10983e14e8f ("drm/scheduler: Job timeout handler returns status (v3)")
I have used the drm-misc tree from next-20210209 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-02-10 3:11 Stephen Rothwell
@ 2021-02-10 14:31 ` Maarten Lankhorst
0 siblings, 0 replies; 241+ messages in thread
From: Maarten Lankhorst @ 2021-02-10 14:31 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Luben Tuikov, Linux Kernel Mailing List,
Linux Next Mailing List
Op 2021-02-10 om 04:11 schreef Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete type
> 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
> drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in function returning void [-Werror=return-type]
> 289 | return DRM_GPU_SCHED_STAT_NOMINAL;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
> 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type
> 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
> | ^~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
> drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in function returning void [-Werror=return-type]
> 309 | return DRM_GPU_SCHED_STAT_NOMINAL;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
> 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
> | ^~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type
> 316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type
> 325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type
> 334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type
> 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
> drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in function returning void [-Werror=return-type]
> 353 | return DRM_GPU_SCHED_STAT_NOMINAL;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
> 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
> 362 | .timedout_job = v3d_bin_job_timedout,
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 'v3d_bin_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
> 369 | .timedout_job = v3d_render_job_timedout,
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 'v3d_render_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
> 376 | .timedout_job = v3d_generic_job_timedout,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 'v3d_tfu_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
> 383 | .timedout_job = v3d_csd_job_timedout,
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 'v3d_csd_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
> 390 | .timedout_job = v3d_generic_job_timedout,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job')
>
> Caused by commit
>
> c10983e14e8f ("drm/scheduler: Job timeout handler returns status (v3)")
>
> I have used the drm-misc tree from next-20210209 for today.
>
Hey,
I reverted the commit in drm-misc-next-fixes. It should be good now. :)
I must have accidentally cherry picked it when grabbing all fixes.
~Maarten
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2021-02-01 2:10 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2021-02-01 2:10 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Luben Tuikov, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 5059 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete type
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in function returning void [-Werror=return-type]
289 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in function returning void [-Werror=return-type]
309 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type
316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type
325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type
334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in function returning void [-Werror=return-type]
353 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
362 | .timedout_job = v3d_bin_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 'v3d_bin_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
369 | .timedout_job = v3d_render_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 'v3d_render_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
376 | .timedout_job = v3d_generic_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 'v3d_tfu_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
383 | .timedout_job = v3d_csd_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 'v3d_csd_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
390 | .timedout_job = v3d_generic_job_timedout,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for 'v3d_cache_clean_sched_ops.timedout_job')
Caused by commit
a6a1f036c74e ("drm/scheduler: Job timeout handler returns status (v3)")
I have used the drm-misc tree from next-20210129 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2021-01-14 0:31 Stephen Rothwell
2021-01-14 11:16 ` Thomas Zimmermann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2021-01-14 0:31 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Thomas Zimmermann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_cache.c: In function 'drm_need_swiotlb':
drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function 'mem_encrypt_active' [-Werror=implicit-function-declaration]
202 | if (mem_encrypt_active())
| ^~~~~~~~~~~~~~~~~~
Caused by commit
3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c")
I have used the drm-misc tree from next-20210107 again for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2021-01-14 0:31 Stephen Rothwell
@ 2021-01-14 11:16 ` Thomas Zimmermann
0 siblings, 0 replies; 241+ messages in thread
From: Thomas Zimmermann @ 2021-01-14 11:16 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 911 bytes --]
Hi
Am 14.01.21 um 01:31 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_cache.c: In function 'drm_need_swiotlb':
> drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function 'mem_encrypt_active' [-Werror=implicit-function-declaration]
> 202 | if (mem_encrypt_active())
> | ^~~~~~~~~~~~~~~~~~
>
>
> Caused by commit
>
> 3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c")
>
> I have used the drm-misc tree from next-20210107 again for today.
Sorry for the breakage. Fixed in drm-misc-next.
Best regards
Thomas
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-11-10 2:26 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-11-10 2:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Dave Airlie
Cc: Thomas Zimmermann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/msm_gem.c:1014:10: error: initialization of 'int (*)(struct drm_gem_object *, struct dma_buf_map *)' from incompatible pointer type 'void * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
1014 | .vmap = msm_gem_prime_vmap,
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/msm/msm_gem.c:1014:10: note: (near initialization for 'msm_gem_object_funcs.vmap')
drivers/gpu/drm/msm/msm_gem.c:1015:12: error: initialization of 'void (*)(struct drm_gem_object *, struct dma_buf_map *)' from incompatible pointer type 'void (*)(struct drm_gem_object *, void *)' [-Werror=incompatible-pointer-types]
1015 | .vunmap = msm_gem_prime_vunmap,
| ^~~~~~~~~~~~~~~~~~~~
Caused by commit
49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends")
interacting with commit
3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs")
from the drm tree.
I tried reverting commit 3c9edd9c85f5 (as 49a3f51dfeee does not revert
cleanly) but that just produced more errors, so I have disabled
CONFIG_DRM_MSM for now.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2020-11-02 1:43 Stephen Rothwell
2020-11-02 9:28 ` Daniel Vetter
2020-11-02 10:19 ` Michael S. Tsirkin
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-11-02 1:43 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Joerg Roedel, Michael S. Tsirkin,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1766 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
99 | return SIZE_MAX;
| ^~~~~~~~
include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
6 | #include <linux/init.h>
+++ |+#include <stdint.h>
7 | #include <linux/types.h>
include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
99 | return SIZE_MAX;
| ^~~~~~~~
Caused by commit
abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
but only exposed by commit
4dbafbd30aef ("drm/nouveu: fix swiotlb include")
I applied the following fix for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Nov 2020 12:34:57 +1100
Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/swiotlb.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 513913ff7486..ed9de7855d3b 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -5,6 +5,9 @@
#include <linux/dma-direction.h>
#include <linux/init.h>
#include <linux/types.h>
+#ifndef CONFIG_SWIOTLB
+#include <linux/limits.h>
+#endif
struct device;
struct page;
--
2.28.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 1:43 Stephen Rothwell
@ 2020-11-02 9:28 ` Daniel Vetter
2020-11-02 10:23 ` Michael S. Tsirkin
2020-11-02 10:27 ` Christoph Hellwig
2020-11-02 10:19 ` Michael S. Tsirkin
1 sibling, 2 replies; 241+ messages in thread
From: Daniel Vetter @ 2020-11-02 9:28 UTC (permalink / raw)
To: Stephen Rothwell, Christoph Hellwig
Cc: Intel Graphics, DRI, Christian König, Joerg Roedel,
Michael S. Tsirkin, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> 99 | return SIZE_MAX;
> | ^~~~~~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> 6 | #include <linux/init.h>
> +++ |+#include <stdint.h>
> 7 | #include <linux/types.h>
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> 99 | return SIZE_MAX;
> | ^~~~~~~~
>
> Caused by commit
>
> abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
>
> but only exposed by commit
>
> 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
>
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
I think simplest if this lands through dma-api tree into current -rc
kernels. Or should we just put this into drm-misc-next since that's
where the problem shows up? Christoph, any preference from dma-api
side?
-Daniel
> ---
> include/linux/swiotlb.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
> #include <linux/dma-direction.h>
> #include <linux/init.h>
> #include <linux/types.h>
> +#ifndef CONFIG_SWIOTLB
> +#include <linux/limits.h>
> +#endif
>
> struct device;
> struct page;
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 9:28 ` Daniel Vetter
@ 2020-11-02 10:23 ` Michael S. Tsirkin
2020-11-02 10:28 ` Daniel Vetter
2020-11-02 10:27 ` Christoph Hellwig
1 sibling, 1 reply; 241+ messages in thread
From: Michael S. Tsirkin @ 2020-11-02 10:23 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Christoph Hellwig, Intel Graphics, DRI,
Christian König, Joerg Roedel, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> > 99 | return SIZE_MAX;
> > | ^~~~~~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> > 6 | #include <linux/init.h>
> > +++ |+#include <stdint.h>
> > 7 | #include <linux/types.h>
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> > 99 | return SIZE_MAX;
> > | ^~~~~~~~
> >
> > Caused by commit
> >
> > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> >
> > but only exposed by commit
> >
> > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> >
> > I applied the following fix for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> >
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> I think simplest if this lands through dma-api tree into current -rc
> kernels. Or should we just put this into drm-misc-next since that's
> where the problem shows up? Christoph, any preference from dma-api
> side?
> -Daniel
Or I can merge it since I merged the original patch causing the
issue ...
> > ---
> > include/linux/swiotlb.h | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > index 513913ff7486..ed9de7855d3b 100644
> > --- a/include/linux/swiotlb.h
> > +++ b/include/linux/swiotlb.h
> > @@ -5,6 +5,9 @@
> > #include <linux/dma-direction.h>
> > #include <linux/init.h>
> > #include <linux/types.h>
> > +#ifndef CONFIG_SWIOTLB
> > +#include <linux/limits.h>
> > +#endif
> >
> > struct device;
> > struct page;
> > --
> > 2.28.0
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 10:23 ` Michael S. Tsirkin
@ 2020-11-02 10:28 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2020-11-02 10:28 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Stephen Rothwell, Christoph Hellwig, Intel Graphics, DRI,
Christian König, Joerg Roedel, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Nov 2, 2020 at 11:23 AM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> > > 99 | return SIZE_MAX;
> > > | ^~~~~~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> > > 6 | #include <linux/init.h>
> > > +++ |+#include <stdint.h>
> > > 7 | #include <linux/types.h>
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> > > 99 | return SIZE_MAX;
> > > | ^~~~~~~~
> > >
> > > Caused by commit
> > >
> > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > >
> > > but only exposed by commit
> > >
> > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > >
> > > I applied the following fix for today:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > >
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > I think simplest if this lands through dma-api tree into current -rc
> > kernels. Or should we just put this into drm-misc-next since that's
> > where the problem shows up? Christoph, any preference from dma-api
> > side?
> > -Daniel
>
>
> Or I can merge it since I merged the original patch causing the
> issue ...
Works for me too.
-Daniel
>
> > > ---
> > > include/linux/swiotlb.h | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> > > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > > index 513913ff7486..ed9de7855d3b 100644
> > > --- a/include/linux/swiotlb.h
> > > +++ b/include/linux/swiotlb.h
> > > @@ -5,6 +5,9 @@
> > > #include <linux/dma-direction.h>
> > > #include <linux/init.h>
> > > #include <linux/types.h>
> > > +#ifndef CONFIG_SWIOTLB
> > > +#include <linux/limits.h>
> > > +#endif
> > >
> > > struct device;
> > > struct page;
> > > --
> > > 2.28.0
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
> >
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 9:28 ` Daniel Vetter
2020-11-02 10:23 ` Michael S. Tsirkin
@ 2020-11-02 10:27 ` Christoph Hellwig
2020-11-02 11:05 ` Michael S. Tsirkin
1 sibling, 1 reply; 241+ messages in thread
From: Christoph Hellwig @ 2020-11-02 10:27 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Christoph Hellwig, Intel Graphics, DRI,
Christian K??nig, Joerg Roedel, Michael S. Tsirkin,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > --- a/include/linux/swiotlb.h
> > +++ b/include/linux/swiotlb.h
> > @@ -5,6 +5,9 @@
> > #include <linux/dma-direction.h>
> > #include <linux/init.h>
> > #include <linux/types.h>
> > +#ifndef CONFIG_SWIOTLB
> > +#include <linux/limits.h>
> > +#endif
No conditional includes please. And the proper fix for the reported
issue is to stop poking into swiotlb internals in random drivers..
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 10:27 ` Christoph Hellwig
@ 2020-11-02 11:05 ` Michael S. Tsirkin
0 siblings, 0 replies; 241+ messages in thread
From: Michael S. Tsirkin @ 2020-11-02 11:05 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Daniel Vetter, Stephen Rothwell, Intel Graphics, DRI,
Christian K??nig, Joerg Roedel, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Nov 02, 2020 at 10:27:11AM +0000, Christoph Hellwig wrote:
> On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > > --- a/include/linux/swiotlb.h
> > > +++ b/include/linux/swiotlb.h
> > > @@ -5,6 +5,9 @@
> > > #include <linux/dma-direction.h>
> > > #include <linux/init.h>
> > > #include <linux/types.h>
> > > +#ifndef CONFIG_SWIOTLB
> > > +#include <linux/limits.h>
> > > +#endif
>
> No conditional includes please. And the proper fix for the reported
> issue is to stop poking into swiotlb internals in random drivers..
Meaning?
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 1:43 Stephen Rothwell
2020-11-02 9:28 ` Daniel Vetter
@ 2020-11-02 10:19 ` Michael S. Tsirkin
2020-11-11 6:10 ` Stephen Rothwell
1 sibling, 1 reply; 241+ messages in thread
From: Michael S. Tsirkin @ 2020-11-02 10:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Christian König,
Joerg Roedel, Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> 99 | return SIZE_MAX;
> | ^~~~~~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> 6 | #include <linux/init.h>
> +++ |+#include <stdint.h>
> 7 | #include <linux/types.h>
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> 99 | return SIZE_MAX;
> | ^~~~~~~~
>
> Caused by commit
>
> abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
>
> but only exposed by commit
>
> 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
>
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
I guess it makes sense to pick this up for this release directly.
I'll merge this unless there are any objections.
> ---
> include/linux/swiotlb.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
> #include <linux/dma-direction.h>
> #include <linux/init.h>
> #include <linux/types.h>
> +#ifndef CONFIG_SWIOTLB
> +#include <linux/limits.h>
> +#endif
>
> struct device;
> struct page;
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-02 10:19 ` Michael S. Tsirkin
@ 2020-11-11 6:10 ` Stephen Rothwell
2020-11-11 12:48 ` Michael S. Tsirkin
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-11-11 6:10 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Daniel Vetter, Intel Graphics, DRI, Christian König,
Joerg Roedel, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1919 bytes --]
Hi Michael,
On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> > 99 | return SIZE_MAX;
> > | ^~~~~~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> > 6 | #include <linux/init.h>
> > +++ |+#include <stdint.h>
> > 7 | #include <linux/types.h>
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> > 99 | return SIZE_MAX;
> > | ^~~~~~~~
> >
> > Caused by commit
> >
> > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> >
> > but only exposed by commit
> >
> > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> >
> > I applied the following fix for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> >
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
> I guess it makes sense to pick this up for this release directly.
> I'll merge this unless there are any objections.
Christoph is right that the include should not be conditional. But I
have not tested that that does not introduce some other problems.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-11-11 6:10 ` Stephen Rothwell
@ 2020-11-11 12:48 ` Michael S. Tsirkin
0 siblings, 0 replies; 241+ messages in thread
From: Michael S. Tsirkin @ 2020-11-11 12:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Christian König,
Joerg Roedel, Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Nov 11, 2020 at 05:10:15PM +1100, Stephen Rothwell wrote:
> Hi Michael,
>
> On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >
> > On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this function)
> > > 99 | return SIZE_MAX;
> > > | ^~~~~~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
> > > 6 | #include <linux/init.h>
> > > +++ |+#include <stdint.h>
> > > 7 | #include <linux/types.h>
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only once for each function it appears in
> > > 99 | return SIZE_MAX;
> > > | ^~~~~~~~
> > >
> > > Caused by commit
> > >
> > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > >
> > > but only exposed by commit
> > >
> > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > >
> > > I applied the following fix for today:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > >
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > I guess it makes sense to pick this up for this release directly.
> > I'll merge this unless there are any objections.
>
> Christoph is right that the include should not be conditional. But I
> have not tested that that does not introduce some other problems.
If there's a problem it will be a build failure - I'll put
it in next for a while, this way we'll find out.
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-10-30 0:07 Stephen Rothwell
2020-10-30 7:53 ` Christian König
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-10-30 0:07 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Christian König, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init':
drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration]
320 | need_swiotlb = !!swiotlb_nr_tbl();
| ^~~~~~~~~~~~~~
Caused by commit
ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2")
I have used the drm-misc tree from next-20201029 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-30 0:07 Stephen Rothwell
@ 2020-10-30 7:53 ` Christian König
0 siblings, 0 replies; 241+ messages in thread
From: Christian König @ 2020-10-30 7:53 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Am 30.10.20 um 01:07 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init':
> drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration]
> 320 | need_swiotlb = !!swiotlb_nr_tbl();
> | ^~~~~~~~~~~~~~
Mhm, thanks for the note. Looks like there is some merge conflict to me.
In my tree there is an "#if IS_ENABLED(CONFIG_SWIOTLB) &&
IS_ENABLED(CONFIG_X86)" around that line making sure the function is
available.
Going to take a look later today.
Christian.
> Caused by commit
>
> ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2")
>
> I have used the drm-misc tree from next-20201029 for today.
>
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-10-08 3:09 Stephen Rothwell
2020-10-08 4:42 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-10-08 3:09 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Sam Ravnborg, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
I noticed that the ingenic driver revert I had been waiting for appeared
in hte drm-misc tree, so I removed the BROKEN dependency for it, but it
produced the above errors, so I have marked it BROKEN again.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-08 3:09 Stephen Rothwell
@ 2020-10-08 4:42 ` Stephen Rothwell
2020-10-12 4:24 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-10-08 4:42 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Sam Ravnborg, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 6096 bytes --]
Hi all,
On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
In file included from include/linux/clk.h:13,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_update_palette':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~~
include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~~
include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^~~
In file included from include/linux/bits.h:22,
from include/linux/bitops.h:5,
from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~~
include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~~
include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~
include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~~~~~~~~~~~~~~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~~~~~~~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
453 | priv->dma_hwdescs->palette[i] = color;
| ^~~~~~~~~~~
| dma_hwdesc_f0
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_plane_atomic_update':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error: 'crtc_state' undeclared (first use in this function); did you mean 'ctx_state'?
467 | crtc_state = state->crtc->state;
| ^~~~~~~~~~
| ctx_state
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each undeclared identifier is reported only once for each function it appears in
At top level:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning: 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
443 | static void ingenic_drm_update_palette(struct ingenic_drm *priv,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
> I noticed that the ingenic driver revert I had been waiting for appeared
> in hte drm-misc tree, so I removed the BROKEN dependency for it, but it
> produced the above errors, so I have marked it BROKEN again.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-08 4:42 ` Stephen Rothwell
@ 2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
` (2 more replies)
0 siblings, 3 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-10-12 4:24 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Sam Ravnborg, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 6457 bytes --]
Hi all,
On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
>
> In file included from include/linux/clk.h:13,
> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_update_palette':
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~~
> include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> | ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~~
> include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> | ^~~
> In file included from include/linux/bits.h:22,
> from include/linux/bitops.h:5,
> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~~
> include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> | ^~~~~~~~~~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> | ^~~~~~~~~~~~~~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~~
> include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> | ^~~~~~~~~~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> | ^~~~~~~~~~~~~~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~
> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant
> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> | ^~~~~~~~~~~~~~~~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> | ^~~~~~~~~~~~~~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~~~~~~~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 453 | priv->dma_hwdescs->palette[i] = color;
> | ^~~~~~~~~~~
> | dma_hwdesc_f0
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_plane_atomic_update':
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error: 'crtc_state' undeclared (first use in this function); did you mean 'ctx_state'?
> 467 | crtc_state = state->crtc->state;
> | ^~~~~~~~~~
> | ctx_state
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each undeclared identifier is reported only once for each function it appears in
> At top level:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning: 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
> 443 | static void ingenic_drm_update_palette(struct ingenic_drm *priv,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> > I noticed that the ingenic driver revert I had been waiting for appeared
> > in hte drm-misc tree, so I removed the BROKEN dependency for it, but it
> > produced the above errors, so I have marked it BROKEN again.
Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
in the drm and drm-misc trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
@ 2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
2020-10-13 11:12 ` Paul Cercueil
2 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-10-12 4:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Paul Cercueil, Sam Ravnborg, Linux Kernel Mailing List,
Linux Next Mailing List, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 6776 bytes --]
Hi all,
[Just adding Dave to cc's]
On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> >
> > In file included from include/linux/clk.h:13,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_update_palette':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~
> > In file included from include/linux/bits.h:22,
> > from include/linux/bitops.h:5,
> > from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 'BUILD_BUG_ON_ZERO'
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant
> > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> > | ^
> > include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > | ^~~~~~~~~~~~~~~~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> > 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> > | ^~~~~~~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~~~~~~~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm' has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> > 453 | priv->dma_hwdescs->palette[i] = color;
> > | ^~~~~~~~~~~
> > | dma_hwdesc_f0
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 'ingenic_drm_plane_atomic_update':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error: 'crtc_state' undeclared (first use in this function); did you mean 'ctx_state'?
> > 467 | crtc_state = state->crtc->state;
> > | ^~~~~~~~~~
> > | ctx_state
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each undeclared identifier is reported only once for each function it appears in
> > At top level:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning: 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
> > 443 | static void ingenic_drm_update_palette(struct ingenic_drm *priv,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > > I noticed that the ingenic driver revert I had been waiting for appeared
> > > in hte drm-misc tree, so I removed the BROKEN dependency for it, but it
> > > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
@ 2020-10-12 10:15 ` Paul Cercueil
2020-10-13 11:12 ` Paul Cercueil
2 siblings, 0 replies; 241+ messages in thread
From: Paul Cercueil @ 2020-10-12 10:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Sam Ravnborg,
Linux Kernel Mailing List, linux-next, Dave Airlie
Hi Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell <sfr@canb.auug.org.au>
a écrit :
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
>> <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>>
>> In file included from include/linux/clk.h:13,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_update_palette':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:33: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:48: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> In file included from include/linux/bits.h:22,
>> from include/linux/bitops.h:5,
>> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>'
>> width not an integer constant
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> | ^
>> include/linux/compiler.h:224:28: note: in expansion of macro
>> 'BUILD_BUG_ON_ZERO'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 453 | priv->dma_hwdescs->palette[i] = color;
>> | ^~~~~~~~~~~
>> | dma_hwdesc_f0
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_plane_atomic_update':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error:
>> 'crtc_state' undeclared (first use in this function); did you mean
>> 'ctx_state'?
>> 467 | crtc_state = state->crtc->state;
>> | ^~~~~~~~~~
>> | ctx_state
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each
>> undeclared identifier is reported only once for each function it
>> appears in
>> At top level:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning:
>> 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
>> 443 | static void ingenic_drm_update_palette(struct ingenic_drm
>> *priv,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> > I noticed that the ingenic driver revert I had been waiting for
>> appeared
>> > in hte drm-misc tree, so I removed the BROKEN dependency for it,
>> but it
>> > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
Ugh, that doesn't look good. I'll send a fix ASAP.
(I was having email problems last week and the original email bounced,
sorry about that)
Cheers,
-Paul
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
@ 2020-10-13 11:12 ` Paul Cercueil
2 siblings, 0 replies; 241+ messages in thread
From: Paul Cercueil @ 2020-10-13 11:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Sam Ravnborg,
Linux Kernel Mailing List, linux-next, Dave Airlie
Hi Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell <sfr@canb.auug.org.au>
a écrit :
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
>> <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>>
>> In file included from include/linux/clk.h:13,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_update_palette':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:33: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:48: note: in definition of macro
>> 'ARRAY_SIZE'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> | ^~~
>> In file included from include/linux/bits.h:22,
>> from include/linux/bitops.h:5,
>> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
>> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~~
>> include/linux/build_bug.h:16:62: note: in definition of macro
>> 'BUILD_BUG_ON_ZERO'
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> |
>> ^
>> include/linux/compiler.h:224:46: note: in expansion of macro
>> '__same_type'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>'
>> width not an integer constant
>> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
>> int:(-!!(e)); })))
>> | ^
>> include/linux/compiler.h:224:28: note: in expansion of macro
>> 'BUILD_BUG_ON_ZERO'
>> 224 | #define __must_be_array(a)
>> BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
>> | ^~~~~~~~~~~~~~~~~
>> include/linux/kernel.h:47:59: note: in expansion of macro
>> '__must_be_array'
>> 47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
>> __must_be_array(arr))
>> |
>> ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
>> expansion of macro 'ARRAY_SIZE'
>> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
>> i++) {
>> | ^~~~~~~~~~
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct
>> ingenic_drm' has no member named 'dma_hwdescs'; did you mean
>> 'dma_hwdesc_f0'?
>> 453 | priv->dma_hwdescs->palette[i] = color;
>> | ^~~~~~~~~~~
>> | dma_hwdesc_f0
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
>> 'ingenic_drm_plane_atomic_update':
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: error:
>> 'crtc_state' undeclared (first use in this function); did you mean
>> 'ctx_state'?
>> 467 | crtc_state = state->crtc->state;
>> | ^~~~~~~~~~
>> | ctx_state
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:467:3: note: each
>> undeclared identifier is reported only once for each function it
>> appears in
>> At top level:
>> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:443:13: warning:
>> 'ingenic_drm_update_palette' defined but not used [-Wunused-function]
>> 443 | static void ingenic_drm_update_palette(struct ingenic_drm
>> *priv,
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> > I noticed that the ingenic driver revert I had been waiting for
>> appeared
>> > in hte drm-misc tree, so I removed the BROKEN dependency for it,
>> but it
>> > produced the above errors, so I have marked it BROKEN again.
>
> Any progress on this? I am still marking CONFIG_DRM_INGENIC as BROKEN
> in the drm and drm-misc trees.
It should be good now.
Cheers,
-Paul
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-08-26 0:55 Stephen Rothwell
2020-09-02 3:06 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-08-26 0:55 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Gerd Hoffmann, Sidong Yang, Alex Deucher
[-- Attachment #1: Type: text/plain, Size: 6033 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_monitors_config':
include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function 'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration]
167 | if (!drm_drv_uses_atomic_modeset(dev)) \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here
194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \
|
drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function)
189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail' used but not defined
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label]
170 | modeset_lock_retry: \
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_dirty':
drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here
194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \
|
drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function)
434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail' used but not defined
411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label]
170 | modeset_lock_retry: \
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
interacting with commit
77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers")
from the drm-misc-fixes tree.
drivers/gpu/drm/qxl/qxl_display.c manages to include
drm/drm_modeset_lock.h by some indirect route, but fails to have
drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should
have included drm/drm_drv.h since it uses things declared there, and
drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
similarly.
I have added the following hack patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Aug 2020 10:40:18 +1000
Subject: [PATCH] fix interaction with drm-misc-fix commit
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index fa79688013b7..6063f3a15329 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -26,6 +26,7 @@
#include <linux/crc32.h>
#include <linux/delay.h>
+#include <drm/drm_drv.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
@@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
qxl_update_offset_props(qdev);
- DRM_MODESET_LOCK_ALL_END(ctx, ret);
+ DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
if (!drm_helper_hpd_irq_event(dev)) {
/* notify that the monitor configuration changed, to
adjust at the arbitrary resolution */
@@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,
clips, num_clips, inc, 0);
out_lock_end:
- DRM_MODESET_LOCK_ALL_END(ctx, ret);
+ DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);
return 0;
}
--
2.28.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-08-26 0:55 Stephen Rothwell
@ 2020-09-02 3:06 ` Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-09-02 3:06 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Gerd Hoffmann, Sidong Yang,
Alex Deucher
[-- Attachment #1: Type: text/plain, Size: 6480 bytes --]
Hi all,
On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_display_read_client_monitors_config':
> include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function 'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration]
> 167 | if (!drm_drv_uses_atomic_modeset(dev)) \
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
> 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here
> 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \
> |
> drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function)
> 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is reported only once for each function it appears in
> drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail' used but not defined
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label]
> 170 | modeset_lock_retry: \
> | ^~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_dirty':
> drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
> 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" defined here
> 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret) \
> |
> drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END' undeclared (first use in this function)
> 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail' used but not defined
> 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' defined but not used [-Wunused-label]
> 170 | modeset_lock_retry: \
> | ^~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 'DRM_MODESET_LOCK_ALL_BEGIN'
> 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
>
> interacting with commit
>
> 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers")
>
> from the drm-misc-fixes tree.
>
> drivers/gpu/drm/qxl/qxl_display.c manages to include
> drm/drm_modeset_lock.h by some indirect route, but fails to have
> drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should
> have included drm/drm_drv.h since it uses things declared there, and
> drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
> similarly.
>
> I have added the following hack patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 26 Aug 2020 10:40:18 +1000
> Subject: [PATCH] fix interaction with drm-misc-fix commit
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
> index fa79688013b7..6063f3a15329 100644
> --- a/drivers/gpu/drm/qxl/qxl_display.c
> +++ b/drivers/gpu/drm/qxl/qxl_display.c
> @@ -26,6 +26,7 @@
> #include <linux/crc32.h>
> #include <linux/delay.h>
>
> +#include <drm/drm_drv.h>
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_gem_framebuffer_helper.h>
> @@ -186,7 +187,7 @@ void qxl_display_read_client_monitors_config(struct qxl_device *qdev)
>
> DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> qxl_update_offset_props(qdev);
> - DRM_MODESET_LOCK_ALL_END(ctx, ret);
> + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> if (!drm_helper_hpd_irq_event(dev)) {
> /* notify that the monitor configuration changed, to
> adjust at the arbitrary resolution */
> @@ -431,7 +432,7 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb,
> clips, num_clips, inc, 0);
>
> out_lock_end:
> - DRM_MODESET_LOCK_ALL_END(ctx, ret);
> + DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);
>
> return 0;
> }
> --
> 2.28.0
This is now a build failure in the drm tree merg. I have added the
above hack to the merge of the drm tree today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-06-17 0:59 Stephen Rothwell
2020-06-17 6:33 ` Thomas Zimmermann
2020-06-24 1:36 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-06-17 0:59 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Emil Velikov,
Felix Kuehling, Alex Deucher
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
| drm_gem_object_put_locked
Caused by commit
ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
interacting with commit
fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
from Linus' tree.
I have applied the following merge fix up patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Jun 2020 10:55:32 +1000
Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index b91b5171270f..9015c7b76d60 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
}
/* Free the BO*/
- drm_gem_object_put_unlocked(&mem->bo->tbo.base);
+ drm_gem_object_put(&mem->bo->tbo.base);
mutex_destroy(&mem->lock);
kfree(mem);
--
2.26.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-17 0:59 Stephen Rothwell
@ 2020-06-17 6:33 ` Thomas Zimmermann
2020-06-17 7:03 ` Stephen Rothwell
2020-06-24 1:36 ` Stephen Rothwell
1 sibling, 1 reply; 241+ messages in thread
From: Thomas Zimmermann @ 2020-06-17 6:33 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Alex Deucher, Felix Kuehling, Linux Next Mailing List,
Linux Kernel Mailing List, Emil Velikov
[-- Attachment #1.1: Type: text/plain, Size: 2315 bytes --]
Hi
Am 17.06.20 um 02:59 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> | drm_gem_object_put_locked
>
> Caused by commit
>
> ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
>
> interacting with commit
>
> fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
>
> from Linus' tree.
>
> I have applied the following merge fix up patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> }
>
> /* Free the BO*/
> - drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> + drm_gem_object_put(&mem->bo->tbo.base);
We recently dropped the _unlock() suffix from drm_gem_object_put(). This
patch should be ok.
Best regards
Thomas
> mutex_destroy(&mem->lock);
> kfree(mem);
>
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-17 6:33 ` Thomas Zimmermann
@ 2020-06-17 7:03 ` Stephen Rothwell
2020-06-17 19:06 ` Emil Velikov
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-06-17 7:03 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: Daniel Vetter, Intel Graphics, DRI, Alex Deucher, Felix Kuehling,
Linux Next Mailing List, Linux Kernel Mailing List, Emil Velikov
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
Hi Thomas,
On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> We recently dropped the _unlock() suffix from drm_gem_object_put(). This
> patch should be ok.
Yes, but what it shows is that the drm-misc tree is still based on
v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get
conflicts against :-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-17 7:03 ` Stephen Rothwell
@ 2020-06-17 19:06 ` Emil Velikov
0 siblings, 0 replies; 241+ messages in thread
From: Emil Velikov @ 2020-06-17 19:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Zimmermann, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Alex Deucher, Felix Kuehling, Emil Velikov
Hi Stephen,
On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Thomas,
>
> On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote:
> >
> > We recently dropped the _unlock() suffix from drm_gem_object_put(). This
> > patch should be ok.
>
> Yes, but what it shows is that the drm-misc tree is still based on
> v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get
> conflicts against :-)
>
Being the culprit here - thanks for the patience and report.
I believe that both AMD and drm-misc teams are aware of this lovely
situation I've put them in.
As you mentioned drm-misc is a bit special and doing the usual
backmerge will be fun.
If you have any tips on how to minimise such issues, I'd gladly utilise them.
Thanks again,
-Emil
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-17 0:59 Stephen Rothwell
2020-06-17 6:33 ` Thomas Zimmermann
@ 2020-06-24 1:36 ` Stephen Rothwell
2020-06-24 5:47 ` Dave Airlie
1 sibling, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-06-24 1:36 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Emil Velikov, Felix Kuehling,
Alex Deucher
[-- Attachment #1: Type: text/plain, Size: 2307 bytes --]
Hi all,
On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> | drm_gem_object_put_locked
>
> Caused by commit
>
> ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
>
> interacting with commit
>
> fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
>
> from Linus' tree.
>
> I have applied the following merge fix up patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> }
>
> /* Free the BO*/
> - drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> + drm_gem_object_put(&mem->bo->tbo.base);
> mutex_destroy(&mem->lock);
> kfree(mem);
>
> --
> 2.26.2
This fix is now needed when I merge the drm tree :-(
Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
tree above was merged before v5.8-rc1, the above patch should be
applied to the drm tree (and should have been part of the patch that
merged the drm-misc tree). I am a bit suprised that the drm tree
currently passes CI.
Sorry, Dave, for not cc'ing you in the original report.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-24 1:36 ` Stephen Rothwell
@ 2020-06-24 5:47 ` Dave Airlie
2020-06-24 7:16 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Dave Airlie @ 2020-06-24 5:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Alex Deucher, Felix Kuehling, Emil Velikov
On Wed, 24 Jun 2020 at 11:36, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> > 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > | drm_gem_object_put_locked
> >
> > Caused by commit
> >
> > ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
> >
> > interacting with commit
> >
> > fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
> >
> > from Linus' tree.
> >
> > I have applied the following merge fix up patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 17 Jun 2020 10:55:32 +1000
> > Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > index b91b5171270f..9015c7b76d60 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> > }
> >
> > /* Free the BO*/
> > - drm_gem_object_put_unlocked(&mem->bo->tbo.base);
> > + drm_gem_object_put(&mem->bo->tbo.base);
> > mutex_destroy(&mem->lock);
> > kfree(mem);
> >
> > --
> > 2.26.2
>
> This fix is now needed when I merge the drm tree :-(
>
> Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
> tree above was merged before v5.8-rc1, the above patch should be
> applied to the drm tree (and should have been part of the patch that
> merged the drm-misc tree). I am a bit suprised that the drm tree
> currently passes CI.
My bad, my local builds passed, as I had made the change but forgot
the commit --amend
Pushed out a new head with it in it now.
Dave.
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-06-24 5:47 ` Dave Airlie
@ 2020-06-24 7:16 ` Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2020-06-24 7:16 UTC (permalink / raw)
To: Dave Airlie
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Alex Deucher, Felix Kuehling, Emil Velikov
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
Hi Dave,
On Wed, 24 Jun 2020 15:47:49 +1000 Dave Airlie <airlied@gmail.com> wrote:
>
> My bad, my local builds passed, as I had made the change but forgot
> the commit --amend
>
> Pushed out a new head with it in it now.
Excellent, thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2020-04-20 3:01 Stephen Rothwell
2020-04-28 22:33 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-04-20 3:01 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Bartlomiej Zolnierkiewicz
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration]
756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
| ^~~~~~~~~~~~~~~~~~~
| pgprot_cached
drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'
Presumably exposed by commit
a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
I just turned off COMPILE_TEST again for today. Please let me know when
this is fixed.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-04-20 3:01 Stephen Rothwell
@ 2020-04-28 22:33 ` Stephen Rothwell
2020-04-29 8:09 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2020-04-28 22:33 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Bartlomiej Zolnierkiewicz
[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]
Hi all,
On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration]
> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
> | ^~~~~~~~~~~~~~~~~~~
> | pgprot_cached
> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'
>
> Presumably exposed by commit
>
> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>
> I just turned off COMPILE_TEST again for today. Please let me know when
> this is fixed.
This still appears to have not been addressed.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-04-28 22:33 ` Stephen Rothwell
@ 2020-04-29 8:09 ` Bartlomiej Zolnierkiewicz
2020-04-29 10:50 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 241+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2020-04-29 8:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List
Hi Stephen,
On 4/29/20 12:33 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the drm-misc tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration]
>> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>> | ^~~~~~~~~~~~~~~~~~~
>> | pgprot_cached
>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'
>>
>> Presumably exposed by commit
>>
>> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>
>> I just turned off COMPILE_TEST again for today. Please let me know when
>> this is fixed.
>
> This still appears to have not been addressed.
Sorry for the delay, I've just posted a patch (also included below):
"[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n"
which should fix it.
Please verify it, thank you!
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n
powerpc allyesconfig fails like this:
drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration]
756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
| ^~~~~~~~~~~~~~~~~~~
| pgprot_cached
drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'
Fix it by adding missing PPC32 dependency.
Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kbuild test robot <lkp@intel.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
drivers/video/fbdev/controlfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: b/drivers/video/fbdev/controlfb.c
===================================================================
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -47,7 +47,7 @@
#include <linux/nvram.h>
#include <linux/adb.h>
#include <linux/cuda.h>
-#ifdef CONFIG_PPC_PMAC
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
#include <asm/prom.h>
#include <asm/btext.h>
#endif
@@ -55,7 +55,7 @@
#include "macmodes.h"
#include "controlfb.h"
-#ifndef CONFIG_PPC_PMAC
+#if !defined(CONFIG_PPC_PMAC) || !defined(CONFIG_PPC32)
#define invalid_vram_cache(addr)
#undef in_8
#undef out_8
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2020-04-29 8:09 ` Bartlomiej Zolnierkiewicz
@ 2020-04-29 10:50 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 241+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2020-04-29 10:50 UTC (permalink / raw)
To: Stephen Rothwell, Sam Ravnborg
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List
On 4/29/20 10:09 AM, Bartlomiej Zolnierkiewicz wrote:
>
> Hi Stephen,
>
> On 4/29/20 12:33 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> After merging the drm-misc tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? [-Werror=implicit-function-declaration]
>>> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>>> | ^~~~~~~~~~~~~~~~~~~
>>> | pgprot_cached
>>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'
>>>
>>> Presumably exposed by commit
>>>
>>> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>>
>>> I just turned off COMPILE_TEST again for today. Please let me know when
>>> this is fixed.
>>
>> This still appears to have not been addressed.
>
> Sorry for the delay, I've just posted a patch (also included below):
>
> "[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n"
>
> which should fix it.
>
> Please verify it, thank you!
I have tested it with powerpc allyesconfig now and it adds one dependency too much,
fixed in v2:
https://lore.kernel.org/lkml/fe520316-3863-e6c4-9581-5d709f49e906@samsung.com/
Sam, could you please review / merge it to drm-misc-next?
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-12-16 1:23 Stephen Rothwell
2019-12-17 13:19 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-12-16 1:23 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Icenowy Zheng, Wolfram Sang, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 2359 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe':
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration]
738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
| ^~~~~~~~~~~~~
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
| ^
Caused by commit
6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
interacting with commit
2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
From Linus' tree.
I have applied the following fix up patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Dec 2019 12:11:19 +1100
Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
index 9917ce0d86a0..56f55c53abfd 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -735,13 +735,13 @@ static int anx6345_i2c_probe(struct i2c_client *client,
/* Map slave addresses of ANX6345 */
for (i = 0; i < I2C_NUM_ADDRESSES; i++) {
if (anx6345_i2c_addresses[i] >> 1 != client->addr)
- anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
+ anx6345->i2c_clients[i] = i2c_new_dummy_device(client->adapter,
anx6345_i2c_addresses[i] >> 1);
else
anx6345->i2c_clients[i] = client;
- if (!anx6345->i2c_clients[i]) {
- err = -ENOMEM;
+ if (IS_ERR(anx6345->i2c_clients[i])) {
+ err = PTR_ERR(anx6345->i2c_clients[i]);
DRM_ERROR("Failed to reserve I2C bus %02x\n",
anx6345_i2c_addresses[i]);
goto err_unregister_i2c;
--
2.24.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-12-16 1:23 Stephen Rothwell
@ 2019-12-17 13:19 ` Daniel Vetter
2019-12-17 20:22 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2019-12-17 13:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Icenowy Zheng, Wolfram Sang,
Wolfram Sang
On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe':
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration]
> 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> | ^~~~~~~~~~~~~
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> | ^
>
> Caused by commit
>
> 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
>
> interacting with commit
>
> 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
>
> From Linus' tree.
>
> I have applied the following fix up patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Dec 2019 12:11:19 +1100
> Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks pulled into drm-next since I just processed the first drm-misc-next
pull.
-Daniel
> ---
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 9917ce0d86a0..56f55c53abfd 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -735,13 +735,13 @@ static int anx6345_i2c_probe(struct i2c_client *client,
> /* Map slave addresses of ANX6345 */
> for (i = 0; i < I2C_NUM_ADDRESSES; i++) {
> if (anx6345_i2c_addresses[i] >> 1 != client->addr)
> - anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> + anx6345->i2c_clients[i] = i2c_new_dummy_device(client->adapter,
> anx6345_i2c_addresses[i] >> 1);
> else
> anx6345->i2c_clients[i] = client;
>
> - if (!anx6345->i2c_clients[i]) {
> - err = -ENOMEM;
> + if (IS_ERR(anx6345->i2c_clients[i])) {
> + err = PTR_ERR(anx6345->i2c_clients[i]);
> DRM_ERROR("Failed to reserve I2C bus %02x\n",
> anx6345_i2c_addresses[i]);
> goto err_unregister_i2c;
> --
> 2.24.0
>
> --
> Cheers,
> Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-12-17 13:19 ` Daniel Vetter
@ 2019-12-17 20:22 ` Stephen Rothwell
2019-12-18 11:53 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-12-17 20:22 UTC (permalink / raw)
To: Daniel Vetter
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Icenowy Zheng, Wolfram Sang,
Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]
Hi Daniel,
On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe':
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration]
> > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > | ^~~~~~~~~~~~~
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > | ^
> >
> > Caused by commit
> >
> > 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
> >
> > interacting with commit
> >
> > 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
> >
> > From Linus' tree.
> >
> > I have applied the following fix up patch for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 16 Dec 2019 12:11:19 +1100
> > Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks pulled into drm-next since I just processed the first drm-misc-next
> pull.
Thanks. For the future, though, merge fixes like this should be part
of the actual merge commit to avoid bisection problems.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-12-17 20:22 ` Stephen Rothwell
@ 2019-12-18 11:53 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2019-12-18 11:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Icenowy Zheng, Wolfram Sang,
Wolfram Sang
On Tue, Dec 17, 2019 at 9:22 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Daniel,
>
> On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter <daniel@ffwll.ch> wrote:
> >
> > On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function 'anx6345_i2c_probe':
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration]
> > > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > > | ^~~~~~~~~~~~~
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment to 'struct i2c_client *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> > > 738 | anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > > | ^
> > >
> > > Caused by commit
> > >
> > > 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
> > >
> > > interacting with commit
> > >
> > > 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
> > >
> > > From Linus' tree.
> > >
> > > I have applied the following fix up patch for today:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 16 Dec 2019 12:11:19 +1100
> > > Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Thanks pulled into drm-next since I just processed the first drm-misc-next
> > pull.
>
> Thanks. For the future, though, merge fixes like this should be part
> of the actual merge commit to avoid bisection problems.
I flip flop on this one, between retaining your contribution
explicitly and merging them in. Usually I squash them in, but this
felt substantial enough to retain explicitly. Worst case if someone is
unlucky they need to git bisect skip once. I guess next time I should
do a topic branch, apply it there on top of the pull, and then pull
that in so that it's both pretty history and no bisect hole.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-10-16 0:22 Stephen Rothwell
2019-10-16 16:21 ` Alex Deucher
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-10-16 0:22 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Alex Deucher
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Huang Rui,
Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory
23 | #include <drm/drmP.h>
| ^~~~~~~~~~~~
Caused by commit
4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
interacting with commit
8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
from the amdgpu tree.
I applied the following merge fix patch for today (which should also
apply to the amdgpu tree).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Oct 2019 11:17:32 +1100
Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
index 14a55003dd81..823527a0fa47 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
@@ -20,7 +20,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <drm/drmP.h>
+#include <linux/device.h>
+
+#include <drm/amd_asic_type.h>
+
#include "amdgpu.h"
#include "amdgpu_tmz.h"
--
2.23.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-16 0:22 Stephen Rothwell
@ 2019-10-16 16:21 ` Alex Deucher
0 siblings, 0 replies; 241+ messages in thread
From: Alex Deucher @ 2019-10-16 16:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Huang Rui, Sam Ravnborg
Applied. Thanks!
Alex
On Tue, Oct 15, 2019 at 8:22 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory
> 23 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
>
> Caused by commit
>
> 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
> 8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
>
> from the amdgpu tree.
>
> I applied the following merge fix patch for today (which should also
> apply to the amdgpu tree).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Oct 2019 11:17:32 +1100
> Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> index 14a55003dd81..823527a0fa47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> @@ -20,7 +20,10 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <drm/drmP.h>
> +#include <linux/device.h>
> +
> +#include <drm/amd_asic_type.h>
> +
> #include "amdgpu.h"
> #include "amdgpu_tmz.h"
>
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-10-09 0:35 Stephen Rothwell
2019-10-09 16:17 ` Alex Deucher
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-10-09 0:35 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Alex Deucher
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Harish Kasiviswanathan, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 2512 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
40 | #include <drm/drmP.h>
| ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
40 | #include <drm/drmP.h>
| ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
40 | #include <drm/drmP.h>
| ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
40 | #include <drm/drmP.h>
| ^~~~~~~~~~~~
Caused by commit
4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
interacting with commit
6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")
from the amdgpu tree.
I added the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Oct 2019 11:24:38 +1100
Subject: [PATCH] drm/amdkfd: update for drmP.h removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index b8b4485c8f74..41bc0428bfc0 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -37,7 +37,9 @@
#include <linux/kref.h>
#include <linux/sysfs.h>
#include <linux/device_cgroup.h>
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
#include <kgd_kfd_interface.h>
#include "amd_shared.h"
@@ -49,8 +51,6 @@
/* GPU ID hash width in bits */
#define KFD_GPU_ID_HASH_WIDTH 16
-struct drm_device;
-
/* Use upper bits of mmap offset to store KFD driver specific information.
* BITS[63:62] - Encode MMAP type
* BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to
--
2.23.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-09 0:35 Stephen Rothwell
@ 2019-10-09 16:17 ` Alex Deucher
0 siblings, 0 replies; 241+ messages in thread
From: Alex Deucher @ 2019-10-09 16:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Harish Kasiviswanathan, Sam Ravnborg
Applied. thanks!
Alex
On Tue, Oct 8, 2019 at 8:36 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
> 40 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
> 40 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
> 40 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
> 40 | #include <drm/drmP.h>
> | ^~~~~~~~~~~~
>
>
> Caused by commit
>
> 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
> 6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")
>
> from the amdgpu tree.
>
> I added the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 9 Oct 2019 11:24:38 +1100
> Subject: [PATCH] drm/amdkfd: update for drmP.h removal
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index b8b4485c8f74..41bc0428bfc0 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -37,7 +37,9 @@
> #include <linux/kref.h>
> #include <linux/sysfs.h>
> #include <linux/device_cgroup.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_device.h>
> #include <kgd_kfd_interface.h>
>
> #include "amd_shared.h"
> @@ -49,8 +51,6 @@
> /* GPU ID hash width in bits */
> #define KFD_GPU_ID_HASH_WIDTH 16
>
> -struct drm_device;
> -
> /* Use upper bits of mmap offset to store KFD driver specific information.
> * BITS[63:62] - Encode MMAP type
> * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-10-07 23:30 Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
` (2 more replies)
0 siblings, 3 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-10-07 23:30 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
interacting with commit
7e86efa2ff03 ("media: cec-gpio: add notifier support")
form the v4l-dvb tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Oct 2019 10:26:05 +1100
Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
cec_notifier_cec_adap_unregister()"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
index 7be91e712c4a..42d2c2cd9a78 100644
--- a/drivers/media/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/platform/cec-gpio/cec-gpio.c
@@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
return 0;
unreg_notifier:
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
del_adap:
cec_delete_adapter(cec->adap);
return ret;
@@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
{
struct cec_gpio *cec = platform_get_drvdata(pdev);
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap);
return 0;
}
--
2.23.0.rc1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 Stephen Rothwell
@ 2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-10-08 3:02 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
Hi all,
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
Sorry, forgot to include the error messages. But they shuld be clear
from the fix ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
@ 2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Hans Verkuil @ 2019-10-08 7:56 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Mauro Carvalho Chehab
Cc: Linux Next Mailing List, Linux Kernel Mailing List
On 10/8/19 1:30 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
That's the correct fix, thank you!
Regards,
Hans
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
@ 2019-10-14 0:12 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-10-14 0:12 UTC (permalink / raw)
To: DRI, Mauro Carvalho Chehab, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Next Mailing List,
Linux Kernel Mailing List, Hans Verkuil
[-- Attachment #1: Type: text/plain, Size: 2938 bytes --]
Hi all,
This is now a semantic conflict between the drm and v4l-dvb trees.
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
262 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
272 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-08-28 8:55 Stephen Rothwell
2019-08-28 9:15 ` Gerd Hoffmann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-08-28 8:55 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/gpu/drm/virtio/virtgpu_object.c:31:67: error: expected ')' before 'int'
module_param_named(virglhack, virtio_gpu_virglrenderer_workaround, int, 0400);
^~~~
)
Caused by commit
3e93bc2a58aa ("drm/virtio: make resource id workaround runtime switchable.")
I applied the following fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Aug 2019 18:37:40 +1000
Subject: [PATCH] drm/virtio: module_param_named() requires linux/moduleparam.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/virtio/virtgpu_object.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index aab5534056ec..b5f8923ac674 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -23,6 +23,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <linux/moduleparam.h>
+
#include <drm/ttm/ttm_execbuf_util.h>
#include "virtgpu_drv.h"
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-08-28 8:55 Stephen Rothwell
@ 2019-08-28 9:15 ` Gerd Hoffmann
0 siblings, 0 replies; 241+ messages in thread
From: Gerd Hoffmann @ 2019-08-28 9:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List
> I applied the following fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Aug 2019 18:37:40 +1000
> Subject: [PATCH] drm/virtio: module_param_named() requires linux/moduleparam.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/virtio/virtgpu_object.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> index aab5534056ec..b5f8923ac674 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> @@ -23,6 +23,8 @@
> * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include <linux/moduleparam.h>
> +
Fix pushed to drm-misc-next.
thanks,
Gerd
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-08-07 3:21 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-08-07 3:21 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Alex Deucher
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Felix Kuehling, Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 2305 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function 'amdgpu_bo_release_notify':
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_lock(bo->resv, NULL);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buffer_object' has no member named 'resv'
r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_unlock(bo->resv);
^~
Caused by commit
5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv")
interacting with commit
ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release")
from the amdgpu tree.
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Aug 2019 13:17:54 +1000
Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo->resv to bo->base.resv"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index b2c03be51c29..2d07f16f1789 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
!(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE))
return;
- reservation_object_lock(bo->resv, NULL);
+ reservation_object_lock(bo->base.resv, NULL);
- r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
+ r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence);
if (!WARN_ON(r)) {
amdgpu_bo_fence(abo, fence, false);
dma_fence_put(fence);
}
- reservation_object_unlock(bo->resv);
+ reservation_object_unlock(bo->base.resv);
}
/**
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2019-08-01 2:30 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-08-01 2:30 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Andrzej Pietrasiewicz, Neil Armstrong, Emil Velikov
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use in this function)
ddc = &radeon_connector->ddc_bus->adapter;
^~~
drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
bed7a2182de6 ("drm/radeon: Provide ddc symlink in connector sysfs directory")
I have used the drm-misc tree from next-20190731 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2019-06-14 4:41 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-06-14 4:41 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Dave Airlie
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Nicholas Kazlauskas, Harry Wentland, Sean Paul
[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: error: initialization of 'int (*)(struct drm_connector *, struct drm_atomic_state *)' from incompatible pointer type 'int (*)(struct drm_connector *, struct drm_connector_state *)' [-Werror=incompatible-pointer-types]
.atomic_check = amdgpu_dm_connector_atomic_check,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: note: (near initialization for 'amdgpu_dm_connector_helper_funcs.atomic_check')
Caused by commit
6f3b62781bbd ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state")
interacting with commit
88694af9e4d1 ("drm/amd/display: Expose HDR output metadata for supported connectors")
from the drm tree.
I added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Jun 2019 14:27:12 +1000
Subject: [PATCH] fixup for "drm: Convert connector_helper_funcs->atomic_check
to accept drm_atomic_state"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 413bf22e9585..b3a083c9a11c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3976,9 +3976,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state,
static int
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
- struct drm_connector_state *new_con_state)
+ struct drm_atomic_state *state)
{
- struct drm_atomic_state *state = new_con_state->state;
+ struct drm_connector_state *new_con_state =
+ drm_atomic_get_new_connector_state(state, conn);
struct drm_connector_state *old_con_state =
drm_atomic_get_old_connector_state(state, conn);
struct drm_crtc *crtc = new_con_state->crtc;
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2019-04-09 6:08 Stephen Rothwell
2019-04-09 7:22 ` Gerd Hoffmann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-04-09 6:08 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Gerd Hoffmann, Noralf Trønnes, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
^~~~~~~~~
__do_irq
drivers/gpu/drm/cirrus/cirrus.c:310:25: warning: passing argument 1 of 'drm_fb_memcpy_dstclip' makes pointer from integer without a cast [-Wint-conversion]
drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:18:34: note: expected 'void *' but argument is of type 'int'
void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb,
~~~~~~^~~
drivers/gpu/drm/cirrus/cirrus.c:314:37: warning: passing argument 1 of 'drm_fb_xrgb8888_to_rgb565_dstclip' makes pointer from integer without a cast [-Wint-conversion]
drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram),
^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:25:46: note: expected 'void *' but argument is of type 'int'
void drm_fb_xrgb8888_to_rgb565_dstclip(void *dst, unsigned int dst_pitch,
~~~~~~^~~
drivers/gpu/drm/cirrus/cirrus.c:319:37: warning: passing argument 1 of 'drm_fb_xrgb8888_to_rgb888_dstclip' makes pointer from integer without a cast [-Wint-conversion]
drm_fb_xrgb8888_to_rgb888_dstclip(__io_virt(cirrus->vram),
^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:28:46: note: expected 'void *' but argument is of type 'int'
void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,
~~~~~~^~~
Caused by commit
ab3e023b1b4c ("drm/cirrus: rewrite and modernize driver.")
I have marked that driver BROKEN for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-09 6:08 Stephen Rothwell
@ 2019-04-09 7:22 ` Gerd Hoffmann
2019-04-09 8:08 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Gerd Hoffmann @ 2019-04-09 7:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Noralf Trønnes, Sam Ravnborg
On Tue, Apr 09, 2019 at 04:08:49PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
> drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
> drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
> ^~~~~~~~~
> __do_irq
Probably just a missing arm/io.h include.
Test build is running ...
cheers,
Gerd
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-09 7:22 ` Gerd Hoffmann
@ 2019-04-09 8:08 ` Stephen Rothwell
2019-04-09 8:31 ` Gerd Hoffmann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-04-09 8:08 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Noralf Trønnes, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 781 bytes --]
Hi Gerd,
On Tue, 9 Apr 2019 09:22:18 +0200 Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Tue, Apr 09, 2019 at 04:08:49PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
> > drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
> > drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
> > ^~~~~~~~~
> > __do_irq
>
> Probably just a missing arm/io.h include.
I assume you meant asm/io.h?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-09 8:08 ` Stephen Rothwell
@ 2019-04-09 8:31 ` Gerd Hoffmann
0 siblings, 0 replies; 241+ messages in thread
From: Gerd Hoffmann @ 2019-04-09 8:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Noralf Trønnes, Sam Ravnborg
On Tue, Apr 09, 2019 at 06:08:55PM +1000, Stephen Rothwell wrote:
> Hi Gerd,
>
> > > drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
> > > ^~~~~~~~~
> > > __do_irq
> >
> > Probably just a missing arm/io.h include.
>
> I assume you meant asm/io.h?
Yes.
cheers,
Gerd
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-04-05 4:55 Stephen Rothwell
2019-04-05 6:03 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-04-05 4:55 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Joel Stanley
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such file or directory
#include <asm/dma-contiguous.h>
^~~~~~~~~~~~~~~~~~~~~~
Caused by commit
4f2a8f5898ec ("drm: Add ASPEED GFX driver")
I have disabled that driver for today (by making it depend on BROKEN).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-05 4:55 Stephen Rothwell
@ 2019-04-05 6:03 ` Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-04-05 6:03 UTC (permalink / raw)
To: DRI, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Next Mailing List,
Linux Kernel Mailing List, Joel Stanley
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
Hi Dave,
On Fri, 5 Apr 2019 15:55:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such file or directory
> #include <asm/dma-contiguous.h>
> ^~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 4f2a8f5898ec ("drm: Add ASPEED GFX driver")
>
> I have disabled that driver for today (by making it depend on BROKEN).
I noticed that this is now in the drm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-04-01 23:50 Stephen Rothwell
2019-04-02 5:55 ` Qiang Yu
2019-04-02 11:21 ` Matthew Wilcox
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-04-01 23:50 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Qiang Yu,
Eric Anholt, Matthew Wilcox
[-- Attachment #1: Type: text/plain, Size: 3232 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/kernel.h:7,
from include/asm-generic/bug.h:18,
from arch/x86/include/asm/bug.h:83,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from drivers/gpu/drm/lima/lima_ctx.c:4:
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
#define UINT_MAX (~0U)
^~~~~
drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
^~~~~~~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/drm/drm_device.h:7,
from drivers/gpu/drm/lima/lima_device.h:7,
from drivers/gpu/drm/lima/lima_ctx.c:6:
include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~^~~~~
drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
^~~
In file included from include/linux/radix-tree.h:31,
from include/linux/idr.h:15,
from include/drm/drm_device.h:7,
from drivers/gpu/drm/lima/lima_device.h:7,
from drivers/gpu/drm/lima/lima_ctx.c:6:
include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
void *entry, struct xa_limit limit, gfp_t gfp)
~~~~~~~~~~~~~~~~^~~~~
Caused by commit
a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
interacting with commit
a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
from Linus' tree (v5.1-rc1).
I have applied the following patch for today. It could be applied as
part of a merge of v5.1-rc1 into drm-misc.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Apr 2019 10:45:32 +1100
Subject: [PATCH] drm/lima: update for xa_alloc API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/lima/lima_ctx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
index c8d12f7c6894..bafa00d74cc5 100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
goto err_out0;
}
- err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
+ err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
if (err < 0)
goto err_out0;
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-01 23:50 Stephen Rothwell
@ 2019-04-02 5:55 ` Qiang Yu
2019-04-02 7:57 ` Daniel Vetter
2019-04-02 11:26 ` Matthew Wilcox
2019-04-02 11:21 ` Matthew Wilcox
1 sibling, 2 replies; 241+ messages in thread
From: Qiang Yu @ 2019-04-02 5:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Eric Anholt, Matthew Wilcox
Thanks, patch is:
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Regards,
Qiang
On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/linux/kernel.h:7,
> from include/asm-generic/bug.h:18,
> from arch/x86/include/asm/bug.h:83,
> from include/linux/bug.h:5,
> from include/linux/mmdebug.h:5,
> from include/linux/gfp.h:5,
> from include/linux/slab.h:15,
> from drivers/gpu/drm/lima/lima_ctx.c:4:
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> #define UINT_MAX (~0U)
> ^~~~~
> drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> ^~~~~~~~
> In file included from include/linux/radix-tree.h:31,
> from include/linux/idr.h:15,
> from include/drm/drm_device.h:7,
> from drivers/gpu/drm/lima/lima_device.h:7,
> from drivers/gpu/drm/lima/lima_ctx.c:6:
> include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> void *entry, struct xa_limit limit, gfp_t gfp)
> ~~~~~~^~~~~
> drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> ^~~
> In file included from include/linux/radix-tree.h:31,
> from include/linux/idr.h:15,
> from include/drm/drm_device.h:7,
> from drivers/gpu/drm/lima/lima_device.h:7,
> from drivers/gpu/drm/lima/lima_ctx.c:6:
> include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> void *entry, struct xa_limit limit, gfp_t gfp)
> ~~~~~~~~~~~~~~~~^~~~~
>
> Caused by commit
>
> a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
>
> interacting with commit
>
> a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
>
> from Linus' tree (v5.1-rc1).
>
> I have applied the following patch for today. It could be applied as
> part of a merge of v5.1-rc1 into drm-misc.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Apr 2019 10:45:32 +1100
> Subject: [PATCH] drm/lima: update for xa_alloc API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> index c8d12f7c6894..bafa00d74cc5 100644
> --- a/drivers/gpu/drm/lima/lima_ctx.c
> +++ b/drivers/gpu/drm/lima/lima_ctx.c
> @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> goto err_out0;
> }
>
> - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> if (err < 0)
> goto err_out0;
>
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 5:55 ` Qiang Yu
@ 2019-04-02 7:57 ` Daniel Vetter
2019-04-02 8:59 ` Qiang Yu
2019-04-02 11:26 ` Matthew Wilcox
1 sibling, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2019-04-02 7:57 UTC (permalink / raw)
To: Qiang Yu
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt,
Matthew Wilcox
On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> Thanks, patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>
Good time to get started with committing patches? In general it's kinda
confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
it gets merged. Big chance the patch will get lost in limbo and fall
through cracks.
-Daniel
>
> Regards,
> Qiang
>
> On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from include/linux/kernel.h:7,
> > from include/asm-generic/bug.h:18,
> > from arch/x86/include/asm/bug.h:83,
> > from include/linux/bug.h:5,
> > from include/linux/mmdebug.h:5,
> > from include/linux/gfp.h:5,
> > from include/linux/slab.h:15,
> > from drivers/gpu/drm/lima/lima_ctx.c:4:
> > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> > #define UINT_MAX (~0U)
> > ^~~~~
> > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > ^~~~~~~~
> > In file included from include/linux/radix-tree.h:31,
> > from include/linux/idr.h:15,
> > from include/drm/drm_device.h:7,
> > from drivers/gpu/drm/lima/lima_device.h:7,
> > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> > void *entry, struct xa_limit limit, gfp_t gfp)
> > ~~~~~~^~~~~
> > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > ^~~
> > In file included from include/linux/radix-tree.h:31,
> > from include/linux/idr.h:15,
> > from include/drm/drm_device.h:7,
> > from drivers/gpu/drm/lima/lima_device.h:7,
> > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> > void *entry, struct xa_limit limit, gfp_t gfp)
> > ~~~~~~~~~~~~~~~~^~~~~
> >
> > Caused by commit
> >
> > a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> >
> > interacting with commit
> >
> > a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> >
> > from Linus' tree (v5.1-rc1).
> >
> > I have applied the following patch for today. It could be applied as
> > part of a merge of v5.1-rc1 into drm-misc.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > Subject: [PATCH] drm/lima: update for xa_alloc API change
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > index c8d12f7c6894..bafa00d74cc5 100644
> > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > goto err_out0;
> > }
> >
> > - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > if (err < 0)
> > goto err_out0;
> >
> > --
> > 2.20.1
> >
> > --
> > Cheers,
> > Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 7:57 ` Daniel Vetter
@ 2019-04-02 8:59 ` Qiang Yu
2019-04-02 9:08 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Qiang Yu @ 2019-04-02 8:59 UTC (permalink / raw)
To: Qiang Yu, Stephen Rothwell, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt,
Matthew Wilcox
Cc: Daniel Vetter
On Tue, Apr 2, 2019 at 3:57 PM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > Thanks, patch is:
> > Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> Good time to get started with committing patches? In general it's kinda
> confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
> it gets merged. Big chance the patch will get lost in limbo and fall
> through cracks.
Thanks for the remind, this patch should only be applied to drm-misc-next
branch when 5.1-rcx branch gets merged to drm-misc-next for the new
xa_alloc API. So I expect the guy who do the 5.1-rcx merge should apply
this patch. Who will do the merge?
Regards,
Qiang
>
> >
> > Regards,
> > Qiang
> >
> > On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > In file included from include/linux/kernel.h:7,
> > > from include/asm-generic/bug.h:18,
> > > from arch/x86/include/asm/bug.h:83,
> > > from include/linux/bug.h:5,
> > > from include/linux/mmdebug.h:5,
> > > from include/linux/gfp.h:5,
> > > from include/linux/slab.h:15,
> > > from drivers/gpu/drm/lima/lima_ctx.c:4:
> > > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> > > #define UINT_MAX (~0U)
> > > ^~~~~
> > > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> > > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > ^~~~~~~~
> > > In file included from include/linux/radix-tree.h:31,
> > > from include/linux/idr.h:15,
> > > from include/drm/drm_device.h:7,
> > > from drivers/gpu/drm/lima/lima_device.h:7,
> > > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> > > void *entry, struct xa_limit limit, gfp_t gfp)
> > > ~~~~~~^~~~~
> > > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> > > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > ^~~
> > > In file included from include/linux/radix-tree.h:31,
> > > from include/linux/idr.h:15,
> > > from include/drm/drm_device.h:7,
> > > from drivers/gpu/drm/lima/lima_device.h:7,
> > > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> > > void *entry, struct xa_limit limit, gfp_t gfp)
> > > ~~~~~~~~~~~~~~~~^~~~~
> > >
> > > Caused by commit
> > >
> > > a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> > >
> > > interacting with commit
> > >
> > > a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> > >
> > > from Linus' tree (v5.1-rc1).
> > >
> > > I have applied the following patch for today. It could be applied as
> > > part of a merge of v5.1-rc1 into drm-misc.
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > > Subject: [PATCH] drm/lima: update for xa_alloc API change
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > > index c8d12f7c6894..bafa00d74cc5 100644
> > > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > > goto err_out0;
> > > }
> > >
> > > - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > > if (err < 0)
> > > goto err_out0;
> > >
> > > --
> > > 2.20.1
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 8:59 ` Qiang Yu
@ 2019-04-02 9:08 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2019-04-02 9:08 UTC (permalink / raw)
To: Qiang Yu
Cc: Stephen Rothwell, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Eric Anholt, Matthew Wilcox,
Daniel Vetter
On Tue, Apr 02, 2019 at 04:59:37PM +0800, Qiang Yu wrote:
> On Tue, Apr 2, 2019 at 3:57 PM Daniel Vetter <daniel@ffwll.ch> wrote:
> >
> > On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > > Thanks, patch is:
> > > Reviewed-by: Qiang Yu <yuq825@gmail.com>
> >
> > Good time to get started with committing patches? In general it's kinda
> > confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
> > it gets merged. Big chance the patch will get lost in limbo and fall
> > through cracks.
>
> Thanks for the remind, this patch should only be applied to drm-misc-next
> branch when 5.1-rcx branch gets merged to drm-misc-next for the new
> xa_alloc API. So I expect the guy who do the 5.1-rcx merge should apply
> this patch. Who will do the merge?
Oh right, I was kinda not yet awake :-)
Yeah Dave/me and drm-misc maintainers will resolve this when drm-misc
lands in drm-next. Might then need a backmerge in drm-misc to roll
forward.
-Daniel
>
> Regards,
> Qiang
>
> >
> > >
> > > Regards,
> > > Qiang
> > >
> > > On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > >
> > > > In file included from include/linux/kernel.h:7,
> > > > from include/asm-generic/bug.h:18,
> > > > from arch/x86/include/asm/bug.h:83,
> > > > from include/linux/bug.h:5,
> > > > from include/linux/mmdebug.h:5,
> > > > from include/linux/gfp.h:5,
> > > > from include/linux/slab.h:15,
> > > > from drivers/gpu/drm/lima/lima_ctx.c:4:
> > > > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > > > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> > > > #define UINT_MAX (~0U)
> > > > ^~~~~
> > > > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> > > > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > > ^~~~~~~~
> > > > In file included from include/linux/radix-tree.h:31,
> > > > from include/linux/idr.h:15,
> > > > from include/drm/drm_device.h:7,
> > > > from drivers/gpu/drm/lima/lima_device.h:7,
> > > > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> > > > void *entry, struct xa_limit limit, gfp_t gfp)
> > > > ~~~~~~^~~~~
> > > > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> > > > err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > > ^~~
> > > > In file included from include/linux/radix-tree.h:31,
> > > > from include/linux/idr.h:15,
> > > > from include/drm/drm_device.h:7,
> > > > from drivers/gpu/drm/lima/lima_device.h:7,
> > > > from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> > > > void *entry, struct xa_limit limit, gfp_t gfp)
> > > > ~~~~~~~~~~~~~~~~^~~~~
> > > >
> > > > Caused by commit
> > > >
> > > > a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> > > >
> > > > interacting with commit
> > > >
> > > > a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> > > >
> > > > from Linus' tree (v5.1-rc1).
> > > >
> > > > I have applied the following patch for today. It could be applied as
> > > > part of a merge of v5.1-rc1 into drm-misc.
> > > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > > > Subject: [PATCH] drm/lima: update for xa_alloc API change
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > > drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > > > index c8d12f7c6894..bafa00d74cc5 100644
> > > > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > > > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > > > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > > > goto err_out0;
> > > > }
> > > >
> > > > - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > > + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > > > if (err < 0)
> > > > goto err_out0;
> > > >
> > > > --
> > > > 2.20.1
> > > >
> > > > --
> > > > Cheers,
> > > > Stephen Rothwell
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 5:55 ` Qiang Yu
2019-04-02 7:57 ` Daniel Vetter
@ 2019-04-02 11:26 ` Matthew Wilcox
2019-04-02 13:56 ` Qiang Yu
1 sibling, 1 reply; 241+ messages in thread
From: Matthew Wilcox @ 2019-04-02 11:26 UTC (permalink / raw)
To: Qiang Yu
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt
On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> Thanks, patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>
This looks like a fairly naive conversion from the old IDR API to the
XArray API. You should be able to remove mgr->lock entirely, relying on
the xa_lock for synchronising free and get. If you think it's worth it,
you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
and then your get path would be lock-free.
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 11:26 ` Matthew Wilcox
@ 2019-04-02 13:56 ` Qiang Yu
2019-04-02 14:10 ` Matthew Wilcox
0 siblings, 1 reply; 241+ messages in thread
From: Qiang Yu @ 2019-04-02 13:56 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt
On Tue, Apr 2, 2019 at 7:26 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > Thanks, patch is:
> > Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> This looks like a fairly naive conversion from the old IDR API to the
> XArray API. You should be able to remove mgr->lock entirely, relying on
> the xa_lock for synchronising free and get.
I'm afraid the a little complex free path may involve some might sleep
functions so use a mutex lock instead of spinlock.
> If you think it's worth it,
> you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
> and then your get path would be lock-free.
I can take a look this way, thanks.
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 13:56 ` Qiang Yu
@ 2019-04-02 14:10 ` Matthew Wilcox
0 siblings, 0 replies; 241+ messages in thread
From: Matthew Wilcox @ 2019-04-02 14:10 UTC (permalink / raw)
To: Qiang Yu
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt
On Tue, Apr 02, 2019 at 09:56:08PM +0800, Qiang Yu wrote:
> On Tue, Apr 2, 2019 at 7:26 PM Matthew Wilcox <willy@infradead.org> wrote:
> >
> > On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > > Thanks, patch is:
> > > Reviewed-by: Qiang Yu <yuq825@gmail.com>
> >
> > This looks like a fairly naive conversion from the old IDR API to the
> > XArray API. You should be able to remove mgr->lock entirely, relying on
> > the xa_lock for synchronising free and get.
>
> I'm afraid the a little complex free path may involve some might sleep
> functions so use a mutex lock instead of spinlock.
Ah, good call ...
+ mutex_lock(&mgr->lock);
+ ctx = xa_erase(&mgr->handles, id);
+ if (ctx)
+ kref_put(&ctx->refcnt, lima_ctx_do_release);
+ else
+ ret = -EINVAL;
+ mutex_unlock(&mgr->lock);
+static void lima_ctx_do_release(struct kref *ref)
+{
+ struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt);
+ int i;
+
+ for (i = 0; i < lima_pipe_num; i++)
+ lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i);
+ kfree(ctx);
+}
+void lima_sched_context_fini(struct lima_sched_pipe *pipe,
+ struct lima_sched_context *context)
+{
+ drm_sched_entity_fini(&context->base);
+}
and drm_sched_entity_fini() can call kthread_park(), which does sleep.
> > If you think it's worth it,
> > you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
> > and then your get path would be lock-free.
>
> I can take a look this way, thanks.
I think that's the only way you can get rid of the mutex, given the
sleeping functions called in the free path.
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-01 23:50 Stephen Rothwell
2019-04-02 5:55 ` Qiang Yu
@ 2019-04-02 11:21 ` Matthew Wilcox
2019-04-02 13:33 ` Qiang Yu
1 sibling, 1 reply; 241+ messages in thread
From: Matthew Wilcox @ 2019-04-02 11:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Qiang Yu, Eric Anholt
On Tue, Apr 02, 2019 at 10:50:06AM +1100, Stephen Rothwell wrote:
> +++ b/drivers/gpu/drm/lima/lima_ctx.c
> @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> goto err_out0;
> }
>
> - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> if (err < 0)
> goto err_out0;
I agree that this is an exact translation of what the code was doing,
but I don't think it's what the author intended the code to do.
They almost certainly meant:
err = xa_alloc(&mgr->handles, id, ctx, xa_limit_32b, GFP_KERNEL);
I'm basing this on:
+struct drm_lima_ctx_create {
+ __u32 id; /* out, context handle */
+ __u32 _pad; /* pad, must be zero */
+};
(and this confusion is exactly why I changed the API ...)
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-04-02 11:21 ` Matthew Wilcox
@ 2019-04-02 13:33 ` Qiang Yu
0 siblings, 0 replies; 241+ messages in thread
From: Qiang Yu @ 2019-04-02 13:33 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt
On Tue, Apr 2, 2019 at 7:21 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Apr 02, 2019 at 10:50:06AM +1100, Stephen Rothwell wrote:
> > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > goto err_out0;
> > }
> >
> > - err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > + err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > if (err < 0)
> > goto err_out0;
>
> I agree that this is an exact translation of what the code was doing,
> but I don't think it's what the author intended the code to do.
> They almost certainly meant:
>
> err = xa_alloc(&mgr->handles, id, ctx, xa_limit_32b, GFP_KERNEL);
>
> I'm basing this on:
>
> +struct drm_lima_ctx_create {
> + __u32 id; /* out, context handle */
> + __u32 _pad; /* pad, must be zero */
> +};
>
> (and this confusion is exactly why I changed the API ...)
Right, I plan to send out a patch like yours after drm-misc-next merge
5.1 changes, as this is a build fix patch and already applied to somewhere.
I can send out another patch now if merge guys could use the new one
directly.
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-02-08 1:38 Stephen Rothwell
2019-02-08 8:52 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-02-08 1:38 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
struct drm_device base;
^~~~
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
^~~~~~~~~
DRM_IOR
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
^~~~~~~~
DRM_IO
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
devm_iounmap(dev, mdev->reg_base);
^~~~~~~~~~~~
pci_iounmap
and lots more ...
Probably caused by commit
e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")
I have used the drm-misc tree from next-20190207 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-02-08 1:38 Stephen Rothwell
@ 2019-02-08 8:52 ` Daniel Vetter
2019-02-08 22:17 ` Sam Ravnborg
0 siblings, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2019-02-08 8:52 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie, Liviu Dudau, Maxime Ripard
Cc: Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Sam Ravnborg
On Fri, Feb 8, 2019 at 2:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
> drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
> struct drm_device base;
> ^~~~
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
> DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
> ^~~~~~~~~
> DRM_IOR
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
> DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
> ^~~~~~~~
> DRM_IO
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
> devm_iounmap(dev, mdev->reg_base);
> ^~~~~~~~~~~~
> pci_iounmap
>
> and lots more ...
>
> Probably caused by commit
>
> e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")
>
> I have used the drm-misc tree from next-20190207 for today.
Yup.
Sam, can you pls take a look at what komeda needs? you need to
manually merge together drm-misc-next and drm-next first I think.
Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-02-08 8:52 ` Daniel Vetter
@ 2019-02-08 22:17 ` Sam Ravnborg
0 siblings, 0 replies; 241+ messages in thread
From: Sam Ravnborg @ 2019-02-08 22:17 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Liviu Dudau, Maxime Ripard,
Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List
Hi Daniel/Stephen
Thanks for the report and the hints how to move forward to fix it.
> Sam, can you pls take a look at what komeda needs? you need to
> manually merge together drm-misc-next and drm-next first I think.
Merged the two tree and fixed build.
Undid the merge and checked that the build was still OK.
Patch sent to dri-devel:
https://lists.freedesktop.org/archives/dri-devel/2019-February/206662.html
> Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
There was a trivial conflict when I merged, but in i915 so I just fixed
it up and kept focus on komeda.
So in other words, yes there is a conflict.
Sam
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-01-08 0:12 Stephen Rothwell
2019-01-08 8:37 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2019-01-08 0:12 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Rob Clark,
Boris Brezillon, Nicholas Kazlauskas, Alex Deucher
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
drm_atomic_private_obj_init(&adev->dm.atomic_obj,
^~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
void drm_atomic_private_obj_init(struct drm_device *dev,
~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
&state->base,
^~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
struct drm_private_obj *obj,
~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
&dm_atomic_state_funcs);
^~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
struct drm_private_state *state,
~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
drm_atomic_private_obj_init(&adev->dm.atomic_obj,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:437:6: note: declared here
void drm_atomic_private_obj_init(struct drm_device *dev,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
interacting with commit
eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
from Linus' tree (merged during the merge window).
Its not obvious how to fix this up, so I have used the drm-misc tree
from next-20190107 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-01-08 0:12 Stephen Rothwell
@ 2019-01-08 8:37 ` Daniel Vetter
2019-01-08 14:01 ` Kazlauskas, Nicholas
2019-01-09 0:29 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Daniel Vetter @ 2019-01-08 8:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Rob Clark, Boris Brezillon,
Nicholas Kazlauskas, Alex Deucher
On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> drm_atomic_private_obj_init(&adev->dm.atomic_obj,
> ^~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
> void drm_atomic_private_obj_init(struct drm_device *dev,
> ~~~~~~~~~~~~~~~~~~~^~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> &state->base,
> ^~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
> struct drm_private_obj *obj,
> ~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> &dm_atomic_state_funcs);
> ^~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
> struct drm_private_state *state,
> ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
> drm_atomic_private_obj_init(&adev->dm.atomic_obj,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:437:6: note: declared here
> void drm_atomic_private_obj_init(struct drm_device *dev,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
>
> interacting with commit
>
> eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
>
> from Linus' tree (merged during the merge window).
>
> Its not obvious how to fix this up, so I have used the drm-misc tree
> from next-20190107 for today.
https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache
is the fixup you want. Should get baked into drm-next any moment, since
the first drm-misc-next pull is already out.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-01-08 8:37 ` Daniel Vetter
@ 2019-01-08 14:01 ` Kazlauskas, Nicholas
2019-01-09 0:29 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Kazlauskas, Nicholas @ 2019-01-08 14:01 UTC (permalink / raw)
To: Stephen Rothwell, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Rob Clark, Boris Brezillon, Deucher,
Alexander
On 1/8/19 3:37 AM, Daniel Vetter wrote:
> On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>> drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>> ^~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
>> void drm_atomic_private_obj_init(struct drm_device *dev,
>> ~~~~~~~~~~~~~~~~~~~^~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>> &state->base,
>> ^~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
>> struct drm_private_obj *obj,
>> ~~~~~~~~~~~~~~~~~~~~~~~~^~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>> &dm_atomic_state_funcs);
>> ^~~~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
>> struct drm_private_state *state,
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
>> drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>> from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>> from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:437:6: note: declared here
>> void drm_atomic_private_obj_init(struct drm_device *dev,
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>> b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
>>
>> interacting with commit
>>
>> eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
>>
>> from Linus' tree (merged during the merge window).
>>
>> Its not obvious how to fix this up, so I have used the drm-misc tree
>> from next-20190107 for today.
>
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache
>
> is the fixup you want. Should get baked into drm-next any moment, since
> the first drm-misc-next pull is already out.
> -Daniel
>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Thanks, that lines up with the other driver fixes that patch added.
I missed that series when I was developing the private state object
patch for amdgpu.
I'll still need to remove our extra lock since the objects now have
their own, but that can come later in another non-fixup patch.
Nicholas Kazlauskas
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2019-01-08 8:37 ` Daniel Vetter
2019-01-08 14:01 ` Kazlauskas, Nicholas
@ 2019-01-09 0:29 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2019-01-09 0:29 UTC (permalink / raw)
To: Daniel Vetter
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Rob Clark, Boris Brezillon,
Nicholas Kazlauskas, Alex Deucher
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi Daniel,
On Tue, 8 Jan 2019 09:37:22 +0100 Daniel Vetter <daniel@ffwll.ch> wrote:
>
>
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache
>
> is the fixup you want. Should get baked into drm-next any moment, since
> the first drm-misc-next pull is already out.
I added that resolution for today, thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2018-12-06 2:32 Stephen Rothwell
2018-12-07 12:37 ` Koenig, Christian
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2018-12-06 2:32 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Christian König, Eric Anholt
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl':
drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function 'drm_syncobj_replace_fence'
drm_syncobj_replace_fence(sync_out, 0, sched_done_fence);
^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_gem.c:5:
include/drm/drm_syncobj.h:134:6: note: declared here
void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
^~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"")
interacting with commit
1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU")
I have used the drm-misc tree from next-20181205 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2018-12-06 2:32 Stephen Rothwell
@ 2018-12-07 12:37 ` Koenig, Christian
0 siblings, 0 replies; 241+ messages in thread
From: Koenig, Christian @ 2018-12-07 12:37 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Eric Anholt
Hi Stephen,
yeah, that is a known problem. I missed the change during rebase of the
revert.
Please see patch "2312f9842854 drm/v3d: fix broken build" which is
already in drm-misc-next and fixes the issue.
Christian.
Am 06.12.18 um 03:32 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl':
> drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function 'drm_syncobj_replace_fence'
> drm_syncobj_replace_fence(sync_out, 0, sched_done_fence);
> ^~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/v3d/v3d_gem.c:5:
> include/drm/drm_syncobj.h:134:6: note: declared here
> void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
> ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"")
>
> interacting with commit
>
> 1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU")
>
> I have used the drm-misc tree from next-20181205 for today.
>
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2017-12-06 1:00 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2017-12-06 1:00 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede, Ville Syrjälä
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/i915/intel_dsi.c: In function 'intel_dsi_get_panel_orientation':
drivers/gpu/drm/i915/intel_dsi.c:1673:13: error: storage size of 'plane' isn't known
enum plane plane;
^
Caused by commit
82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
interacting with commit
ed15030d7ab0 ("drm/i915: s/enum plane/enum i9xx_plane_id/")
from the drm-intel tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Dec 2017 11:56:32 +1100
Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum
i9xx_plane_id/"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/intel_dsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 1b60df3c14a0..f67d321376e4 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector)
{
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
- enum plane plane;
+ enum i9xx_plane_id plane;
u32 val;
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
--
2.15.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2017-07-19 1:46 Stephen Rothwell
2017-07-21 0:08 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-07-19 1:46 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Greg KH
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Hans de Goede
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
.set_busid = drm_pci_set_busid,
^
drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
.set_busid = drm_pci_set_busid,
^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
return drm_pci_init(&driver, &vbox_pci_driver);
^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
drm_pci_exit(&driver, &vbox_pci_driver);
^
Caused by commits
5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")
interacting with commit
dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")
from the staging.current tree.
I have applied the following merge fix patch - please check that it
is correct.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jul 2017 11:41:01 +1000
Subject: [PATCH] drm: fixes for staging due to API changes in the drm core
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
index 92ae1560a16d..6d0600c37c0c 100644
--- a/drivers/staging/vboxvideo/vbox_drv.c
+++ b/drivers/staging/vboxvideo/vbox_drv.c
@@ -232,7 +232,6 @@ static struct drm_driver driver = {
.lastclose = vbox_driver_lastclose,
.master_set = vbox_master_set,
.master_drop = vbox_master_drop,
- .set_busid = drm_pci_set_busid,
.fops = &vbox_fops,
.irq_handler = vbox_irq_handler,
@@ -270,12 +269,12 @@ static int __init vbox_init(void)
if (vbox_modeset == 0)
return -EINVAL;
- return drm_pci_init(&driver, &vbox_pci_driver);
+ return pci_register_driver(&vbox_pci_driver);
}
static void __exit vbox_exit(void)
{
- drm_pci_exit(&driver, &vbox_pci_driver);
+ pci_unregister_driver(&vbox_pci_driver);
}
module_init(vbox_init);
--
2.13.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-19 1:46 Stephen Rothwell
@ 2017-07-21 0:08 ` Stephen Rothwell
2017-07-21 7:24 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-07-21 0:08 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Greg KH,
Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede
Hi Dave,
The following is now applicable to the drm and staging.current trees ...
On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
> .set_busid = drm_pci_set_busid,
> ^
> drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
> .set_busid = drm_pci_set_busid,
> ^
> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
> drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
> return drm_pci_init(&driver, &vbox_pci_driver);
> ^
> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
> drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
> drm_pci_exit(&driver, &vbox_pci_driver);
> ^
>
> Caused by commits
>
> 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
> 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")
>
> interacting with commit
>
> dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")
>
> from the staging.current tree.
>
> I have applied the following merge fix patch - please check that it
> is correct.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 19 Jul 2017 11:41:01 +1000
> Subject: [PATCH] drm: fixes for staging due to API changes in the drm core
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
> index 92ae1560a16d..6d0600c37c0c 100644
> --- a/drivers/staging/vboxvideo/vbox_drv.c
> +++ b/drivers/staging/vboxvideo/vbox_drv.c
> @@ -232,7 +232,6 @@ static struct drm_driver driver = {
> .lastclose = vbox_driver_lastclose,
> .master_set = vbox_master_set,
> .master_drop = vbox_master_drop,
> - .set_busid = drm_pci_set_busid,
>
> .fops = &vbox_fops,
> .irq_handler = vbox_irq_handler,
> @@ -270,12 +269,12 @@ static int __init vbox_init(void)
> if (vbox_modeset == 0)
> return -EINVAL;
>
> - return drm_pci_init(&driver, &vbox_pci_driver);
> + return pci_register_driver(&vbox_pci_driver);
> }
>
> static void __exit vbox_exit(void)
> {
> - drm_pci_exit(&driver, &vbox_pci_driver);
> + pci_unregister_driver(&vbox_pci_driver);
> }
>
> module_init(vbox_init);
> --
> 2.13.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-21 0:08 ` Stephen Rothwell
@ 2017-07-21 7:24 ` Daniel Vetter
2017-07-21 19:01 ` Hans de Goede
2017-07-24 0:03 ` Stephen Rothwell
0 siblings, 2 replies; 241+ messages in thread
From: Daniel Vetter @ 2017-07-21 7:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Intel Graphics, DRI, Greg KH,
Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede
Hi Greg&Hans,
How are we going to handle this now? The refactor is deeply burried in
drm-misc, I guess you could cherry-pick the relevant patches over. But
that'll probably lead to more conflicts because git will get confused.
Or you could just delete the set_busid hook in -staging, which renders
the driver unbisectable since it'll only work when merged together
with the drm trees.
This is pretty much why I don't like -staging, it makes cross
subsystem refactorings (which is already hard, getting 20+ driver
folks to agree on stuff sometimes) unecessarily harder.
Cheers, Daniel
On Fri, Jul 21, 2017 at 2:08 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> The following is now applicable to the drm and staging.current trees ...
>
> On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
>> .set_busid = drm_pci_set_busid,
>> ^
>> drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
>> .set_busid = drm_pci_set_busid,
>> ^
>> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
>> drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
>> return drm_pci_init(&driver, &vbox_pci_driver);
>> ^
>> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
>> drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
>> drm_pci_exit(&driver, &vbox_pci_driver);
>> ^
>>
>> Caused by commits
>>
>> 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
>> 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")
>>
>> interacting with commit
>>
>> dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")
>>
>> from the staging.current tree.
>>
>> I have applied the following merge fix patch - please check that it
>> is correct.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 19 Jul 2017 11:41:01 +1000
>> Subject: [PATCH] drm: fixes for staging due to API changes in the drm core
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
>> index 92ae1560a16d..6d0600c37c0c 100644
>> --- a/drivers/staging/vboxvideo/vbox_drv.c
>> +++ b/drivers/staging/vboxvideo/vbox_drv.c
>> @@ -232,7 +232,6 @@ static struct drm_driver driver = {
>> .lastclose = vbox_driver_lastclose,
>> .master_set = vbox_master_set,
>> .master_drop = vbox_master_drop,
>> - .set_busid = drm_pci_set_busid,
>>
>> .fops = &vbox_fops,
>> .irq_handler = vbox_irq_handler,
>> @@ -270,12 +269,12 @@ static int __init vbox_init(void)
>> if (vbox_modeset == 0)
>> return -EINVAL;
>>
>> - return drm_pci_init(&driver, &vbox_pci_driver);
>> + return pci_register_driver(&vbox_pci_driver);
>> }
>>
>> static void __exit vbox_exit(void)
>> {
>> - drm_pci_exit(&driver, &vbox_pci_driver);
>> + pci_unregister_driver(&vbox_pci_driver);
>> }
>>
>> module_init(vbox_init);
>> --
>> 2.13.2
>
> --
> Cheers,
> Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-21 7:24 ` Daniel Vetter
@ 2017-07-21 19:01 ` Hans de Goede
2017-07-24 0:03 ` Stephen Rothwell
1 sibling, 0 replies; 241+ messages in thread
From: Hans de Goede @ 2017-07-21 19:01 UTC (permalink / raw)
To: Daniel Vetter, Stephen Rothwell
Cc: Dave Airlie, Intel Graphics, DRI, Greg KH,
Linux-Next Mailing List, Linux Kernel Mailing List
Hi,
On 21-07-17 09:24, Daniel Vetter wrote:
> Hi Greg&Hans,
>
> How are we going to handle this now? The refactor is deeply burried in
> drm-misc, I guess you could cherry-pick the relevant patches over. But
> that'll probably lead to more conflicts because git will get confused.
>
> Or you could just delete the set_busid hook in -staging, which renders
> the driver unbisectable since it'll only work when merged together
> with the drm trees.
Removing the set_busid hook in staging (but only for -next, not
for -linus) is fine with me.
Regards,
Hans
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-21 7:24 ` Daniel Vetter
2017-07-21 19:01 ` Hans de Goede
@ 2017-07-24 0:03 ` Stephen Rothwell
2017-07-24 8:24 ` Daniel Vetter
1 sibling, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-07-24 0:03 UTC (permalink / raw)
To: Daniel Vetter
Cc: Dave Airlie, Intel Graphics, DRI, Greg KH,
Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede
Hi Daniel,
On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> How are we going to handle this now? The refactor is deeply burried in
> drm-misc, I guess you could cherry-pick the relevant patches over. But
> that'll probably lead to more conflicts because git will get confused.
I'll just keep applying the merge resolution patch and will remind Dave
and Greg about it during the week before the merge window opens so that
they can let Linus know that the fix up is needed.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-24 0:03 ` Stephen Rothwell
@ 2017-07-24 8:24 ` Daniel Vetter
2017-07-24 18:33 ` Greg KH
0 siblings, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2017-07-24 8:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Intel Graphics, DRI, Greg KH,
Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede
On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Daniel,
>
> On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>
>> How are we going to handle this now? The refactor is deeply burried in
>> drm-misc, I guess you could cherry-pick the relevant patches over. But
>> that'll probably lead to more conflicts because git will get confused.
>
> I'll just keep applying the merge resolution patch and will remind Dave
> and Greg about it during the week before the merge window opens so that
> they can let Linus know that the fix up is needed.
Well, Greg squeezed the vbox driver into -rc2, so now we already get
to resolve this in a backmerge. And hopefully the bikeshed patches in
-staging won't interfere too badly with whatever refactoring we'll do
in drm-next.
Greg, fyi this is the last time I'll ack a drm driver for staging.
This just doesn't work. We're spending more time here working the
-staging vs. drm-next conflicts than the actual vbox driver review has
taken me. And probly less than the cleanup for merging directly to
drm-next will end up taking.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2017-07-24 8:24 ` Daniel Vetter
@ 2017-07-24 18:33 ` Greg KH
0 siblings, 0 replies; 241+ messages in thread
From: Greg KH @ 2017-07-24 18:33 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, DRI,
Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede
On Mon, Jul 24, 2017 at 10:24:41AM +0200, Daniel Vetter wrote:
> On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Daniel,
> >
> > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> >>
> >> How are we going to handle this now? The refactor is deeply burried in
> >> drm-misc, I guess you could cherry-pick the relevant patches over. But
> >> that'll probably lead to more conflicts because git will get confused.
> >
> > I'll just keep applying the merge resolution patch and will remind Dave
> > and Greg about it during the week before the merge window opens so that
> > they can let Linus know that the fix up is needed.
>
> Well, Greg squeezed the vbox driver into -rc2, so now we already get
> to resolve this in a backmerge. And hopefully the bikeshed patches in
> -staging won't interfere too badly with whatever refactoring we'll do
> in drm-next.
>
> Greg, fyi this is the last time I'll ack a drm driver for staging.
> This just doesn't work. We're spending more time here working the
> -staging vs. drm-next conflicts than the actual vbox driver review has
> taken me. And probly less than the cleanup for merging directly to
> drm-next will end up taking.
Hey, I was amazed that you all acked it, and it's why I required that
you do so before I took it :)
Good luck with the merges!
greg k-h
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2017-07-18 1:38 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2017-07-18 1:38 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Al Viro
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler")
interacting with commit
d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()")
from Linus' tree.
You should consider rebasing your branch onto v4.13-rc1 (or merging
v4.13-rc1) so that these (unnecessary) conflicts don't keep happening
during development and the next merge window.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Jul 2017 11:35:10 +1000
Subject: [PATCH] drm/vblank: fix for "switch compat_drm_wait_vblank() to
drm_ioctl_kernel()"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/drm_ioc32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index d1f202852028..f8e96e648acf 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -842,7 +842,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
req.request.type = req32.request.type;
req.request.sequence = req32.request.sequence;
req.request.signal = req32.request.signal;
- err = drm_ioctl_kernel(file, drm_wait_vblank, &req, DRM_UNLOCKED);
+ err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED);
if (err)
return err;
--
2.13.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2017-04-21 2:10 Stephen Rothwell
2017-04-21 5:03 ` Logan Gunthorpe
` (2 more replies)
0 siblings, 3 replies; 241+ messages in thread
From: Stephen Rothwell @ 2017-04-21 2:10 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Logan Gunthorpe, Sumit Semwal, Jens Wiklander
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
.kmap_atomic = tee_shm_op_kmap_atomic,
^
drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.kmap_atomic = tee_shm_op_kmap_atomic,
^
drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
.kmap = tee_shm_op_kmap,
^
drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.kmap = tee_shm_op_kmap,
^
drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
Caused by commit
f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
interacting with commit
967c9cca2cc5 ("tee: generic TEE subsystem")
from the arm-soc tree.
I applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Apr 2017 12:06:32 +1000
Subject: [PATCH] tee: merge fix for dma-ops field name changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tee/tee_shm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 0be1e3e93bee..4e14c9c9cb1c 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
.map_dma_buf = tee_shm_op_map_dma_buf,
.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
.release = tee_shm_op_release,
- .kmap_atomic = tee_shm_op_kmap_atomic,
- .kmap = tee_shm_op_kmap,
+ .map_atomic = tee_shm_op_kmap_atomic,
+ .map = tee_shm_op_kmap,
.mmap = tee_shm_op_mmap,
};
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-04-21 2:10 Stephen Rothwell
@ 2017-04-21 5:03 ` Logan Gunthorpe
2017-04-24 1:25 ` Stephen Rothwell
2017-05-03 23:50 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Logan Gunthorpe @ 2017-04-21 5:03 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Olof Johansson, Arnd Bergmann, ARM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sumit Semwal,
Jens Wiklander
Thanks Stephen. Looks good to me.
Logan
On 20/04/17 08:10 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
>
> Caused by commit
>
> f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
>
> interacting with commit
>
> 967c9cca2cc5 ("tee: generic TEE subsystem")
>
> from the arm-soc tree.
>
> I applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/tee/tee_shm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> .map_dma_buf = tee_shm_op_map_dma_buf,
> .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> .release = tee_shm_op_release,
> - .kmap_atomic = tee_shm_op_kmap_atomic,
> - .kmap = tee_shm_op_kmap,
> + .map_atomic = tee_shm_op_kmap_atomic,
> + .map = tee_shm_op_kmap,
> .mmap = tee_shm_op_mmap,
> };
>
>
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-04-21 2:10 Stephen Rothwell
2017-04-21 5:03 ` Logan Gunthorpe
@ 2017-04-24 1:25 ` Stephen Rothwell
2017-05-02 8:25 ` Daniel Vetter
2017-05-03 23:50 ` Stephen Rothwell
2 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-04-24 1:25 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Linux-Next Mailing List,
Linux Kernel Mailing List, Logan Gunthorpe, Sumit Semwal,
Jens Wiklander
Hi all,
On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
>
> Caused by commit
>
> f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
>
> interacting with commit
>
> 967c9cca2cc5 ("tee: generic TEE subsystem")
>
> from the arm-soc tree.
>
> I applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/tee/tee_shm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> .map_dma_buf = tee_shm_op_map_dma_buf,
> .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> .release = tee_shm_op_release,
> - .kmap_atomic = tee_shm_op_kmap_atomic,
> - .kmap = tee_shm_op_kmap,
> + .map_atomic = tee_shm_op_kmap_atomic,
> + .map = tee_shm_op_kmap,
> .mmap = tee_shm_op_mmap,
> };
>
> --
> 2.11.0
This merge fix is now needed when I merge the drm tree (as Dave merged
the drm-misc tree).
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-04-24 1:25 ` Stephen Rothwell
@ 2017-05-02 8:25 ` Daniel Vetter
2017-05-02 8:41 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Daniel Vetter @ 2017-05-02 8:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Dave Airlie, Daniel Vetter,
Intel Graphics, DRI, Linux-Next Mailing List,
Linux Kernel Mailing List, Logan Gunthorpe, Sumit Semwal,
Jens Wiklander
On Mon, Apr 24, 2017 at 11:25:12AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> > .kmap_atomic = tee_shm_op_kmap_atomic,
> > ^
> > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> > .kmap_atomic = tee_shm_op_kmap_atomic,
> > ^
> > drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> > .kmap = tee_shm_op_kmap,
> > ^
> > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> > .kmap = tee_shm_op_kmap,
> > ^
> > drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
> >
> > Caused by commit
> >
> > f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
> >
> > interacting with commit
> >
> > 967c9cca2cc5 ("tee: generic TEE subsystem")
> >
> > from the arm-soc tree.
> >
> > I applied the following merge fix patch for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 21 Apr 2017 12:06:32 +1000
> > Subject: [PATCH] tee: merge fix for dma-ops field name changes
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/tee/tee_shm.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> > index 0be1e3e93bee..4e14c9c9cb1c 100644
> > --- a/drivers/tee/tee_shm.c
> > +++ b/drivers/tee/tee_shm.c
> > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> > .map_dma_buf = tee_shm_op_map_dma_buf,
> > .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> > .release = tee_shm_op_release,
> > - .kmap_atomic = tee_shm_op_kmap_atomic,
> > - .kmap = tee_shm_op_kmap,
> > + .map_atomic = tee_shm_op_kmap_atomic,
> > + .map = tee_shm_op_kmap,
> > .mmap = tee_shm_op_mmap,
> > };
Since this is an all-new driver it might be best to stagger the pull
requests and merge the new tee subsystem (or whatever it is) after drm?
Not sure what to best do here ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-05-02 8:25 ` Daniel Vetter
@ 2017-05-02 8:41 ` Stephen Rothwell
2017-05-02 8:55 ` Arnd Bergmann
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-05-02 8:41 UTC (permalink / raw)
To: Daniel Vetter
Cc: Olof Johansson, Arnd Bergmann, ARM, Dave Airlie, Daniel Vetter,
Intel Graphics, DRI, Linux-Next Mailing List,
Linux Kernel Mailing List, Logan Gunthorpe, Sumit Semwal,
Jens Wiklander
Hi Daniel,
On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>
> Since this is an all-new driver it might be best to stagger the pull
> requests and merge the new tee subsystem (or whatever it is) after drm?
>
> Not sure what to best do here ...
This will merge via Dave, so Dave just needs to let Linus know that a
fix up is needed when this merges with the arm-soc stuff in Linus' tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2017-05-02 8:41 ` Stephen Rothwell
@ 2017-05-02 8:55 ` Arnd Bergmann
2017-05-02 9:34 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Arnd Bergmann @ 2017-05-02 8:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Olof Johansson, ARM, Dave Airlie, Daniel Vetter,
Intel Graphics, DRI, Linux-Next Mailing List,
Linux Kernel Mailing List, Logan Gunthorpe, Sumit Semwal,
Jens Wiklander
On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>>
>> Since this is an all-new driver it might be best to stagger the pull
>> requests and merge the new tee subsystem (or whatever it is) after drm?
>>
>> Not sure what to best do here ...
>
> This will merge via Dave, so Dave just needs to let Linus know that a
> fix up is needed when this merges with the arm-soc stuff in Linus' tree.
The TEE subsystem is currently on a separate branch by itself in arm-soc,
so we could easily delay that until DRM is in, and point out the resolution
here.
Arnd
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-05-02 8:55 ` Arnd Bergmann
@ 2017-05-02 9:34 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2017-05-02 9:34 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, Olof Johansson, ARM, Dave Airlie,
Intel Graphics, DRI, Linux-Next Mailing List,
Linux Kernel Mailing List, Logan Gunthorpe, Sumit Semwal,
Jens Wiklander
On Tue, May 2, 2017 at 10:55 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Daniel,
>>
>> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>>>
>>> Since this is an all-new driver it might be best to stagger the pull
>>> requests and merge the new tee subsystem (or whatever it is) after drm?
>>>
>>> Not sure what to best do here ...
>>
>> This will merge via Dave, so Dave just needs to let Linus know that a
>> fix up is needed when this merges with the arm-soc stuff in Linus' tree.
>
> The TEE subsystem is currently on a separate branch by itself in arm-soc,
> so we could easily delay that until DRM is in, and point out the resolution
> here.
Dave is somewhere without mail, but I chatted with him quickly and he
agrees this seems simplest. drm-next main pull should go out somewhere
tomorrow he said.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2017-04-21 2:10 Stephen Rothwell
2017-04-21 5:03 ` Logan Gunthorpe
2017-04-24 1:25 ` Stephen Rothwell
@ 2017-05-03 23:50 ` Stephen Rothwell
2 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2017-05-03 23:50 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Logan Gunthorpe, Sumit Semwal, Jens Wiklander
Hi all,
On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
>
> Caused by commit
>
> f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
>
> interacting with commit
>
> 967c9cca2cc5 ("tee: generic TEE subsystem")
>
> from the arm-soc tree.
>
> I applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/tee/tee_shm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> .map_dma_buf = tee_shm_op_map_dma_buf,
> .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> .release = tee_shm_op_release,
> - .kmap_atomic = tee_shm_op_kmap_atomic,
> - .kmap = tee_shm_op_kmap,
> + .map_atomic = tee_shm_op_kmap_atomic,
> + .map = tee_shm_op_kmap,
> .mmap = tee_shm_op_mmap,
> };
>
> --
> 2.11.0
This fixup is now needed when merging the arm-soc tree with Linus' tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2017-04-03 3:31 Stephen Rothwell
2017-04-03 17:26 ` Sinclair Yeh
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2017-04-03 3:31 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Dave Airlie
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sinclair Yeh
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip':
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
^
In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0:
include/drm/drm_atomic_helper.h:126:5: note: declared here
int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
^
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip':
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
^
In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0:
include/drm/drm_atomic_helper.h:126:5: note: declared here
int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
^
Caused by commit
41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)")
interacting with commits
904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU")
b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU")
from the drm tree.
I added this merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Apr 2017 13:25:55 +1000
Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 02b8f2541dca..8d7dc9def7c2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
return -EINVAL;
flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
- ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
+ ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
if (ret) {
DRM_ERROR("Page flip error %d.\n", ret);
return ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index e59bbcd8b226..bad31bdf09b6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc,
* don't hand it to the helper.
*/
flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
- ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
+ ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
if (ret) {
DRM_ERROR("Page flip error %d.\n", ret);
return ret;
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2017-04-03 3:31 Stephen Rothwell
@ 2017-04-03 17:26 ` Sinclair Yeh
0 siblings, 0 replies; 241+ messages in thread
From: Sinclair Yeh @ 2017-04-03 17:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, DRI, Dave Airlie,
Linux-Next Mailing List, Linux Kernel Mailing List
Thanks for this. This and "drm/vmwgfx: merge fixup for set_config API change":
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
On Mon, Apr 03, 2017 at 01:31:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip':
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
> ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> ^
> In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0:
> include/drm/drm_atomic_helper.h:126:5: note: declared here
> int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
> ^
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip':
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
> ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> ^
> In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0:
> include/drm/drm_atomic_helper.h:126:5: note: declared here
> int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
> ^
>
> Caused by commit
>
> 41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)")
>
> interacting with commits
>
> 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU")
> b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU")
>
> from the drm tree.
>
> I added this merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 3 Apr 2017 13:25:55 +1000
> Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index 02b8f2541dca..8d7dc9def7c2 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
> return -EINVAL;
>
> flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
> - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
> if (ret) {
> DRM_ERROR("Page flip error %d.\n", ret);
> return ret;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> index e59bbcd8b226..bad31bdf09b6 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc,
> * don't hand it to the helper.
> */
> flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
> - ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> + ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
> if (ret) {
> DRM_ERROR("Page flip error %d.\n", ret);
> return ret;
> --
> 2.11.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2017-01-05 0:53 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2017-01-05 0:53 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI; +Cc: linux-next, linux-kernel, Randy Dunlap
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/usb/Kconfig:39:error: recursive dependency detected!
drivers/usb/Kconfig:39: symbol USB is selected by MOUSE_APPLETOUCH
drivers/input/mouse/Kconfig:187: symbol MOUSE_APPLETOUCH depends on INPUT
drivers/input/Kconfig:8: symbol INPUT is selected by VT
drivers/tty/Kconfig:12: symbol VT is selected by FB_STI
drivers/video/fbdev/Kconfig:678: symbol FB_STI depends on FB
drivers/video/fbdev/Kconfig:5: symbol FB is selected by DRM_KMS_FB_HELPER
drivers/gpu/drm/Kconfig:72: symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:66: symbol DRM_KMS_HELPER is selected by DRM_NOUVEAU
drivers/gpu/drm/nouveau/Kconfig:1: symbol DRM_NOUVEAU depends on LEDS_CLASS
drivers/leds/Kconfig:16: symbol LEDS_CLASS is selected by OMAP_DEBUG_LEDS
arch/arm/plat-omap/Kconfig:19: symbol OMAP_DEBUG_LEDS depends on NEW_LEDS
drivers/leds/Kconfig:8: symbol NEW_LEDS is selected by ATH9K_HTC
drivers/net/wireless/ath/ath9k/Kconfig:158: symbol ATH9K_HTC depends on USB
Caused by commit
a5ad0fd8524e ("drm: nouveau: fix build when LEDS_CLASS=m")
I have reverted that commit for today (just because I had to to make
sure that was the problem).
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2016-11-09 0:14 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2016-11-09 0:14 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI; +Cc: linux-next, linux-kernel, Chris Wilson
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "depot_save_stack" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "depot_fetch_stack" [drivers/gpu/drm/drm.ko] undefined!
Caused by commit
5705670d0463 ("drm: Track drm_mm allocators and show leaks on shutdown")
I hate used the drm-misc tree from next-20161108 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2016-10-24 0:24 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2016-10-24 0:24 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: linux-next, linux-kernel, Tvrtko Ursulin, Ville Syrjälä
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/i915/intel_drv.h:32:0,
from drivers/gpu/drm/i915/intel_display.c:36:
drivers/gpu/drm/i915/intel_display.c: In function 'intel_primary_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15077:6: note: in expansion of macro 'INTEL_GEN'
if (INTEL_GEN(dev) >= 9) {
^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15081:13: note: in expansion of macro 'INTEL_GEN'
} else if (INTEL_GEN(dev) >= 4) {
^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15088:6: note: in expansion of macro 'INTEL_GEN'
if (INTEL_GEN(dev) >= 4)
^
drivers/gpu/drm/i915/intel_display.c: In function 'intel_cursor_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'
#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
^
drivers/gpu/drm/i915/intel_display.c:15231:6: note: in expansion of macro 'INTEL_GEN'
if (INTEL_GEN(dev) >= 4)
^
Caused by commit
93ca7e006670 ("drm/i915: Use the per-plane rotation property")
interacting with commit
55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv")
from the drm-intel tree.
I added this merge fix patch:
>From 3d8024ddc9cd584e23e9ff4845a46475972c3d36 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Oct 2016 11:12:05 +1100
Subject: [PATCH] drm/i915: merge fix for INTEL_GEN API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/intel_display.c | 9 +++++----
drivers/gpu/drm/i915/intel_sprite.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c2a8df968b03..89d73ab020e7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15074,18 +15074,18 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
if (ret)
goto fail;
- if (INTEL_GEN(dev) >= 9) {
+ if (INTEL_GEN(dev_priv) >= 9) {
supported_rotations =
DRM_ROTATE_0 | DRM_ROTATE_90 |
DRM_ROTATE_180 | DRM_ROTATE_270;
- } else if (INTEL_GEN(dev) >= 4) {
+ } else if (INTEL_GEN(dev_priv) >= 4) {
supported_rotations =
DRM_ROTATE_0 | DRM_ROTATE_180;
} else {
supported_rotations = DRM_ROTATE_0;
}
- if (INTEL_GEN(dev) >= 4)
+ if (INTEL_GEN(dev_priv) >= 4)
drm_plane_create_rotation_property(&primary->base,
DRM_ROTATE_0,
supported_rotations);
@@ -15199,6 +15199,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
{
struct intel_plane *cursor = NULL;
struct intel_plane_state *state = NULL;
+ struct drm_i915_private *dev_priv = to_i915(dev);
int ret;
cursor = kzalloc(sizeof(*cursor), GFP_KERNEL);
@@ -15228,7 +15229,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
if (ret)
goto fail;
- if (INTEL_GEN(dev) >= 4)
+ if (INTEL_GEN(dev_priv) >= 4)
drm_plane_create_rotation_property(&cursor->base,
DRM_ROTATE_0,
DRM_ROTATE_0 |
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 9436d041389f..43d0350856e7 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1126,7 +1126,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
goto fail;
}
- if (INTEL_GEN(dev) >= 9) {
+ if (INTEL_GEN(dev_priv) >= 9) {
supported_rotations =
DRM_ROTATE_0 | DRM_ROTATE_90 |
DRM_ROTATE_180 | DRM_ROTATE_270;
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2016-02-10 1:24 Stephen Rothwell
2016-02-10 6:31 ` Daniel Vetter
2016-02-10 8:41 ` Lukas Wunner
0 siblings, 2 replies; 241+ messages in thread
From: Stephen Rothwell @ 2016-02-10 1:24 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Lukas Wunner, Darren Hart
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
include/linux/apple-gmux.h: In function 'apple_gmux_present':
include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
^
Caused by commit
2413306c2566 ("apple-gmux: Add helper for presence detect")
I have used the drm-misc tree from next-20160209 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2016-02-10 1:24 Stephen Rothwell
@ 2016-02-10 6:31 ` Daniel Vetter
2016-02-10 8:41 ` Lukas Wunner
1 sibling, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2016-02-10 6:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, linux-next, linux-kernel,
Lukas Wunner, Darren Hart
On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> ^
>
> Caused by commit
>
> 2413306c2566 ("apple-gmux: Add helper for presence detect")
>
> I have used the drm-misc tree from next-20160209 for today.
Can you pls attach your .config? The function is there, I suspect we're
just missing some depends in Kconfig.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2016-02-10 1:24 Stephen Rothwell
2016-02-10 6:31 ` Daniel Vetter
@ 2016-02-10 8:41 ` Lukas Wunner
2016-02-10 13:17 ` Lukas Wunner
1 sibling, 1 reply; 241+ messages in thread
From: Lukas Wunner @ 2016-02-10 8:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, linux-next, linux-kernel,
Darren Hart, Rafael J. Wysocki, linux-acpi
[cc += Rafael J. Wysocki, linux-acpi]
Hi Stephen,
On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> ^
>
> Caused by commit
>
> 2413306c2566 ("apple-gmux: Add helper for presence detect")
>
> I have used the drm-misc tree from next-20160209 for today.
Ugh, apologies, I didn't have a non-ACPI platform available to test
this on.
Solution is to either add to include/linux/acpi.h
static inline bool acpi_dev_present(const char *hid)
{
return false;
}
somewhere below
#else /* !CONFIG_ACPI */
or alternatively to add to include/linux/apple-gmux.h
IS_ENABLED(CONFIG_ACPI)
in apple_gmux_present().
I'll check the other users of acpi_dev_present() to see which of
these two solutions is more appropriate and will post a fix shortly.
Thanks a lot for reporting this.
Lukas
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2016-02-10 8:41 ` Lukas Wunner
@ 2016-02-10 13:17 ` Lukas Wunner
2016-02-10 13:37 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Lukas Wunner @ 2016-02-10 13:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, linux-next, linux-kernel,
Darren Hart, Rafael J. Wysocki, linux-acpi
Hi,
On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> > ^
> >
> > Caused by commit
> >
> > 2413306c2566 ("apple-gmux: Add helper for presence detect")
> >
> > I have used the drm-misc tree from next-20160209 for today.
>
> Ugh, apologies, I didn't have a non-ACPI platform available to test
> this on.
>
> Solution is to either add to include/linux/acpi.h
>
> static inline bool acpi_dev_present(const char *hid)
> {
> return false;
> }
>
> somewhere below
>
> #else /* !CONFIG_ACPI */
>
> or alternatively to add to include/linux/apple-gmux.h
>
> IS_ENABLED(CONFIG_ACPI)
>
> in apple_gmux_present().
>
> I'll check the other users of acpi_dev_present() to see which of
> these two solutions is more appropriate and will post a fix shortly.
The patch included below fixes the build if CONFIG_ACPI is not set.
@Daniel Vetter: Would it be possible to squash this with 2413306c2566
("apple-gmux: Add helper for presence detect") on topic/drm-misc so
as to avoid build breakage for anyone trying to bisect between that
commit and this fix?
I checked all other users of acpi_dev_present() and all of them are
only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
<linux/apple-gmux.h> rather than in <linux/acpi.h>.
Thanks again Stephen for reporting this at such an early stage,
though doubtlessly it would have been better if I had thought of
this possibility when preparing the original patch, or if I had
compile-tested without CONFIG_ACPI. :-(
Lukas
-- >8 --
Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI
The DRM drivers i915, nouveau and radeon may be compiled with
CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.
Add a no-op stub for apple_gmux_present() which is used if
CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
(CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
include/linux/apple-gmux.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
index feebc28..b2d32e0 100644
--- a/include/linux/apple-gmux.h
+++ b/include/linux/apple-gmux.h
@@ -22,6 +22,8 @@
#define GMUX_ACPI_HID "APP000B"
+#if IS_ENABLED(CONFIG_APPLE_GMUX)
+
/**
* apple_gmux_present() - detect if gmux is built into the machine
*
@@ -33,7 +35,16 @@
*/
static inline bool apple_gmux_present(void)
{
- return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
+ return acpi_dev_present(GMUX_ACPI_HID);
}
+#else /* !CONFIG_APPLE_GMUX */
+
+static inline bool apple_gmux_present(void)
+{
+ return false;
+}
+
+#endif /* !CONFIG_APPLE_GMUX */
+
#endif /* LINUX_APPLE_GMUX_H */
--
1.8.5.2 (Apple Git-48)
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2016-02-10 13:17 ` Lukas Wunner
@ 2016-02-10 13:37 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2016-02-10 13:37 UTC (permalink / raw)
To: Lukas Wunner
Cc: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel,
linux-next, linux-kernel, Darren Hart, Rafael J. Wysocki,
linux-acpi
On Wed, Feb 10, 2016 at 02:17:41PM +0100, Lukas Wunner wrote:
> Hi,
>
> On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> > On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> > > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> > > ^
> > >
> > > Caused by commit
> > >
> > > 2413306c2566 ("apple-gmux: Add helper for presence detect")
> > >
> > > I have used the drm-misc tree from next-20160209 for today.
> >
> > Ugh, apologies, I didn't have a non-ACPI platform available to test
> > this on.
> >
> > Solution is to either add to include/linux/acpi.h
> >
> > static inline bool acpi_dev_present(const char *hid)
> > {
> > return false;
> > }
> >
> > somewhere below
> >
> > #else /* !CONFIG_ACPI */
> >
> > or alternatively to add to include/linux/apple-gmux.h
> >
> > IS_ENABLED(CONFIG_ACPI)
> >
> > in apple_gmux_present().
> >
> > I'll check the other users of acpi_dev_present() to see which of
> > these two solutions is more appropriate and will post a fix shortly.
>
> The patch included below fixes the build if CONFIG_ACPI is not set.
>
> @Daniel Vetter: Would it be possible to squash this with 2413306c2566
> ("apple-gmux: Add helper for presence detect") on topic/drm-misc so
> as to avoid build breakage for anyone trying to bisect between that
> commit and this fix?
>
> I checked all other users of acpi_dev_present() and all of them are
> only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
> <linux/apple-gmux.h> rather than in <linux/acpi.h>.
>
> Thanks again Stephen for reporting this at such an early stage,
> though doubtlessly it would have been better if I had thought of
> this possibility when preparing the original patch, or if I had
> compile-tested without CONFIG_ACPI. :-(
Since !ACPI and enabling APPLE_GMUX is a bit a fringe config I don't think
this will hurt bisectability at all on a real system. So just applied this
one on top of drm-misc.
Thanks, Daniel
>
> Lukas
>
> -- >8 --
> Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI
>
> The DRM drivers i915, nouveau and radeon may be compiled with
> CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.
>
> Add a no-op stub for apple_gmux_present() which is used if
> CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
> (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> ---
> include/linux/apple-gmux.h | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
> index feebc28..b2d32e0 100644
> --- a/include/linux/apple-gmux.h
> +++ b/include/linux/apple-gmux.h
> @@ -22,6 +22,8 @@
>
> #define GMUX_ACPI_HID "APP000B"
>
> +#if IS_ENABLED(CONFIG_APPLE_GMUX)
> +
> /**
> * apple_gmux_present() - detect if gmux is built into the machine
> *
> @@ -33,7 +35,16 @@
> */
> static inline bool apple_gmux_present(void)
> {
> - return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> + return acpi_dev_present(GMUX_ACPI_HID);
> }
>
> +#else /* !CONFIG_APPLE_GMUX */
> +
> +static inline bool apple_gmux_present(void)
> +{
> + return false;
> +}
> +
> +#endif /* !CONFIG_APPLE_GMUX */
> +
> #endif /* LINUX_APPLE_GMUX_H */
> --
> 1.8.5.2 (Apple Git-48)
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2015-12-08 0:20 Stephen Rothwell
0 siblings, 0 replies; 241+ messages in thread
From: Stephen Rothwell @ 2015-12-08 0:20 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/i2c/tda998x_drv.c:1354:2: error: unknown field 'save' specified in initializer
.save = tda998x_encoder_save,
^
drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
.save = tda998x_encoder_save,
^
drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: note: (near initialization for 'tda998x_encoder_helper_funcs.mode_fixup')
drivers/gpu/drm/i2c/tda998x_drv.c:1355:2: error: unknown field 'restore' specified in initializer
.restore = tda998x_encoder_restore,
^
Caused by commit
79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau")
I have used the drm-misc tree from next-20151207 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 241+ messages in thread* linux-next: build failure after merge of the drm-misc tree
@ 2015-10-01 2:47 Stephen Rothwell
2015-10-01 6:41 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2015-10-01 2:47 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined!
Not quite sure which commit caused this, but I have used the drm-misc
tree from next-20150930 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 241+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2015-10-01 2:47 Stephen Rothwell
@ 2015-10-01 6:41 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2015-10-01 6:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, linux-next, linux-kernel
On Thu, Oct 01, 2015 at 12:47:17PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined!
>
> Not quite sure which commit caused this, but I have used the drm-misc
> tree from next-20150930 for today.
Build fail for CONFIG_AGP=m (bot not y or n). I'm wrestling kbuild atm.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2015-09-03 0:49 Stephen Rothwell
2015-09-07 23:42 ` Stephen Rothwell
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2015-09-03 0:49 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Maarten Lankhorst, Daniel Stone
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
struct drm_framebuffer *fb = old_state->fb;
^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
struct drm_framebuffer *fb,
^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
.cleanup_fb = mdp5_plane_cleanup_fb,
^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
Caused by commit
a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
Well, that was clearly never build tested :-(
I have used the drm-misc tree from next-20150902 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-09-03 0:49 Stephen Rothwell
@ 2015-09-07 23:42 ` Stephen Rothwell
2015-09-08 4:48 ` Maarten Lankhorst
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2015-09-07 23:42 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Maarten Lankhorst, Daniel Stone
Hi all,
On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
> struct drm_framebuffer *fb = old_state->fb;
> ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
> struct drm_framebuffer *fb,
> ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
> .cleanup_fb = mdp5_plane_cleanup_fb,
> ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
>
> Caused by commit
>
> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
>
> Well, that was clearly never build tested :-(
>
> I have used the drm-misc tree from next-20150902 for today.
This is still in today's linux-next :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-09-07 23:42 ` Stephen Rothwell
@ 2015-09-08 4:48 ` Maarten Lankhorst
2015-09-08 8:16 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Maarten Lankhorst @ 2015-09-08 4:48 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Daniel Stone
Op 08-09-15 om 01:42 schreef Stephen Rothwell:
> Hi all,
>
> On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> After merging the drm-misc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
>> struct drm_framebuffer *fb = old_state->fb;
>> ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
>> struct drm_framebuffer *fb,
>> ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
>> .cleanup_fb = mdp5_plane_cleanup_fb,
>> ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
>>
>> Caused by commit
>>
>> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
>>
>> Well, that was clearly never build tested :-(
>>
>> I have used the drm-misc tree from next-20150902 for today.
> This is still in today's linux-next :-(
>
I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel?
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 4d390b699e9a..a0f5ff0ce8dc 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
}
static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
- struct drm_framebuffer *fb,
const struct drm_plane_state *old_state)
{
struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-09-08 4:48 ` Maarten Lankhorst
@ 2015-09-08 8:16 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2015-09-08 8:16 UTC (permalink / raw)
To: Maarten Lankhorst
Cc: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel,
linux-next, linux-kernel, Daniel Stone
On Tue, Sep 08, 2015 at 06:48:34AM +0200, Maarten Lankhorst wrote:
> Op 08-09-15 om 01:42 schreef Stephen Rothwell:
> > Hi all,
> >
> > On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> After merging the drm-misc tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
> >> struct drm_framebuffer *fb = old_state->fb;
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
> >> struct drm_framebuffer *fb,
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
> >> .cleanup_fb = mdp5_plane_cleanup_fb,
> >> ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
> >>
> >> Caused by commit
> >>
> >> a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
> >>
> >> Well, that was clearly never build tested :-(
> >>
> >> I have used the drm-misc tree from next-20150902 for today.
> > This is still in today's linux-next :-(
> >
> I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel?
Squashed in, thanks.
-Daniel
>
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 4d390b699e9a..a0f5ff0ce8dc 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
> }
>
> static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
> - struct drm_framebuffer *fb,
> const struct drm_plane_state *old_state)
> {
> struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2015-07-14 2:52 Stephen Rothwell
2015-07-14 5:00 ` Archit Taneja
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2015-07-14 2:52 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Archit Taneja
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
^
Caused by commit
7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")
I have used the drm-misc tree from next-20150713 for today.
(That commit said "COMPILE TESTED ONLY" :-()
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-07-14 2:52 Stephen Rothwell
@ 2015-07-14 5:00 ` Archit Taneja
2015-07-14 7:36 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Archit Taneja @ 2015-07-14 5:00 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel
Hi,
On 07/14/2015 08:22 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
> drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
> drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
> ^
>
> Caused by commit
>
> 7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")
>
> I have used the drm-misc tree from next-20150713 for today.
>
> (That commit said "COMPILE TESTED ONLY" :-()
My bad. The commit messages were for a slightly older version.
I'll fix this, and the warnings in the other mail.
Thanks,
Archit
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-07-14 5:00 ` Archit Taneja
@ 2015-07-14 7:36 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2015-07-14 7:36 UTC (permalink / raw)
To: Archit Taneja
Cc: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel,
linux-next, linux-kernel
On Tue, Jul 14, 2015 at 10:30:56AM +0530, Archit Taneja wrote:
>
> Hi,
>
> On 07/14/2015 08:22 AM, Stephen Rothwell wrote:
> >Hi all,
> >
> >After merging the drm-misc tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
> >
> >drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
> >drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
> > drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
> > ^
> >
> >Caused by commit
> >
> > 7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")
> >
> >I have used the drm-misc tree from next-20150713 for today.
> >
> >(That commit said "COMPILE TESTED ONLY" :-()
>
> My bad. The commit messages were for a slightly older version.
> I'll fix this, and the warnings in the other mail.
Yeah it's a big patch series with a testing chicken-egg problem, so I
figured I'll give it a spin in -next. Dropped again until it works better.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2015-02-24 0:41 Stephen Rothwell
2015-02-24 0:59 ` Daniel Vetter
0 siblings, 1 reply; 241+ messages in thread
From: Stephen Rothwell @ 2015-02-24 0:41 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel, Thierry Reding
Cc: linux-next, linux-kernel, Rob Clark, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/tegra/drm.c: In function 'tegra_atomic_complete':
drivers/gpu/drm/tegra/drm.c:58:2: error: implicit declaration of function 'drm_atomic_helper_commit_pre_planes' [-Werror=implicit-function-declaration]
drm_atomic_helper_commit_pre_planes(drm, state);
^
drivers/gpu/drm/tegra/drm.c:60:2: error: implicit declaration of function 'drm_atomic_helper_commit_post_planes' [-Werror=implicit-function-declaration]
drm_atomic_helper_commit_post_planes(drm, state);
^
Caused by commit ad9e7c89a4e4 ("drm/atomic-helper: Rename
commmit_post/pre_planes") interacting with commit 1503ca47d76e
("drm/tegra: Atomic conversion, phase 3, step 3") from v4.0-rc1.
I added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Feb 2015 11:37:11 +1100
Subject: [PATCH] drm/atomic-helper: fix for Rename commmit_post/pre_planes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/tegra/drm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 7dd328d77996..5f1880766110 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -55,9 +55,9 @@ static void tegra_atomic_complete(struct tegra_drm *tegra,
* current layout.
*/
- drm_atomic_helper_commit_pre_planes(drm, state);
+ drm_atomic_helper_commit_modeset_disables(drm, state);
drm_atomic_helper_commit_planes(drm, state);
- drm_atomic_helper_commit_post_planes(drm, state);
+ drm_atomic_helper_commit_modeset_enables(drm, state);
drm_atomic_helper_wait_for_vblanks(drm, state);
--
2.1.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 241+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2015-02-24 0:41 Stephen Rothwell
@ 2015-02-24 0:59 ` Daniel Vetter
0 siblings, 0 replies; 241+ messages in thread
From: Daniel Vetter @ 2015-02-24 0:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, Thierry Reding, linux-next,
linux-kernel, Rob Clark, Laurent Pinchart
On Tue, Feb 24, 2015 at 11:41:40AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/tegra/drm.c: In function 'tegra_atomic_complete':
> drivers/gpu/drm/tegra/drm.c:58:2: error: implicit declaration of function 'drm_atomic_helper_commit_pre_planes' [-Werror=implicit-function-declaration]
> drm_atomic_helper_commit_pre_planes(drm, state);
> ^
> drivers/gpu/drm/tegra/drm.c:60:2: error: implicit declaration of function 'drm_atomic_helper_commit_post_planes' [-Werror=implicit-function-declaration]
> drm_atomic_helper_commit_post_planes(drm, state);
> ^
>
> Caused by commit ad9e7c89a4e4 ("drm/atomic-helper: Rename
> commmit_post/pre_planes") interacting with commit 1503ca47d76e
> ("drm/tegra: Atomic conversion, phase 3, step 3") from v4.0-rc1.
>
> I added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 24 Feb 2015 11:37:11 +1100
> Subject: [PATCH] drm/atomic-helper: fix for Rename commmit_post/pre_planes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
I've squashed this into the relevant patch in drm-misc, thanks for
reporting and fixing this.
-Daniel
> ---
> drivers/gpu/drm/tegra/drm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index 7dd328d77996..5f1880766110 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -55,9 +55,9 @@ static void tegra_atomic_complete(struct tegra_drm *tegra,
> * current layout.
> */
>
> - drm_atomic_helper_commit_pre_planes(drm, state);
> + drm_atomic_helper_commit_modeset_disables(drm, state);
> drm_atomic_helper_commit_planes(drm, state);
> - drm_atomic_helper_commit_post_planes(drm, state);
> + drm_atomic_helper_commit_modeset_enables(drm, state);
>
> drm_atomic_helper_wait_for_vblanks(drm, state);
>
> --
> 2.1.4
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 241+ messages in thread
end of thread, other threads:[~2026-09-24 17:16 UTC | newest]
Thread overview: 241+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-28 3:42 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2025-05-28 7:17 ` Damon Ding
2025-05-28 8:27 ` Heiko Stübner
-- strict thread matches above, loose matches on Subject: below --
2026-09-23 13:25 Mark Brown
2026-09-23 13:45 ` Alex Deucher
2026-09-23 14:26 ` Mark Brown
2026-09-23 21:57 ` Alex Deucher
2026-09-24 16:54 ` Mark Brown
2026-09-24 17:01 ` Alex Deucher
2026-09-24 17:16 ` Mark Brown
2026-09-23 14:01 ` Jani Nikula
2026-09-08 14:01 Mark Brown
2026-09-08 14:06 ` Mark Brown
2026-09-08 15:15 ` Alex Deucher
2026-09-08 15:22 ` Mark Brown
2026-09-01 14:05 Mark Brown
2026-09-02 6:52 ` Ivaylo Dimitrov
2026-09-02 12:11 ` Mark Brown
2026-09-02 13:11 ` Tomi Valkeinen
2026-09-02 14:40 ` Mark Brown
2026-09-07 14:01 ` Mark Brown
2026-09-07 14:03 ` Tomi Valkeinen
2026-09-07 14:08 ` Mark Brown
2026-09-08 7:22 ` Tomi Valkeinen
2026-07-21 14:06 Mark Brown
2026-07-22 8:44 ` Neil Armstrong
2026-05-25 15:02 Mark Brown
2026-05-25 15:27 ` Icenowy Zheng
2026-02-23 18:56 Mark Brown
2026-02-23 18:48 Mark Brown
2026-02-23 19:57 ` Leon Romanovsky
2026-02-24 9:43 ` Christian König
2026-01-19 17:37 Mark Brown
2026-01-19 23:09 ` Dmitry Baryshkov
2025-11-03 0:24 Stephen Rothwell
2025-11-03 9:26 ` Jani Nikula
2025-11-03 23:11 ` Stephen Rothwell
2025-11-04 10:17 ` Jani Nikula
2025-08-29 2:23 Stephen Rothwell
2025-08-29 8:01 ` Danilo Krummrich
2025-07-15 3:55 Stephen Rothwell
2025-02-13 0:38 Stephen Rothwell
2024-12-09 1:17 Stephen Rothwell
2024-09-04 2:52 Stephen Rothwell
2024-09-04 9:57 ` Jani Nikula
2024-05-29 2:35 Stephen Rothwell
2024-05-29 8:21 ` Maxime Ripard
2024-05-29 2:29 Stephen Rothwell
2024-04-02 23:47 Stephen Rothwell
2024-02-22 1:46 Stephen Rothwell
2024-02-22 8:14 ` Biju Das
2024-02-22 8:29 ` Geert Uytterhoeven
2024-02-22 9:16 ` Biju Das
2024-02-22 8:32 ` Maxime Ripard
2024-02-22 8:49 ` Biju Das
2024-02-13 1:04 Stephen Rothwell
2024-02-12 1:26 Stephen Rothwell
2024-02-12 9:12 ` Jani Nikula
2024-02-12 13:09 ` Jani Nikula
2024-02-06 4:28 Stephen Rothwell
2024-02-12 1:25 ` Stephen Rothwell
2024-02-12 13:15 ` Jani Nikula
2024-02-19 21:48 ` Stephen Rothwell
2024-02-25 21:41 ` Stephen Rothwell
2024-02-25 21:47 ` Stephen Rothwell
2024-02-26 12:56 ` Christian König
2024-02-06 1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
2024-02-06 12:39 ` Thomas Hellström
2024-02-07 2:46 ` Stephen Rothwell
2023-11-26 23:38 Stephen Rothwell
2023-11-27 2:12 ` Luben Tuikov
2023-10-12 1:22 Stephen Rothwell
2023-10-12 1:27 ` Stephen Rothwell
2023-10-12 7:09 ` Greg Kroah-Hartman
2023-10-20 2:00 ` Stephen Rothwell
2023-08-07 1:36 Stephen Rothwell
2023-04-03 2:16 Stephen Rothwell
2023-04-03 8:51 ` Qiang Yu
2023-04-04 1:14 ` Stephen Rothwell
2022-11-17 7:32 Stephen Rothwell
2022-11-23 5:20 ` Stephen Rothwell
2022-11-23 5:35 ` David Airlie
2022-11-23 6:22 ` Stephen Rothwell
2022-11-23 8:33 ` Thomas Zimmermann
2022-11-16 0:38 Stephen Rothwell
2022-11-10 0:10 Stephen Rothwell
2022-10-21 0:02 Stephen Rothwell
2022-10-21 1:11 ` Zack Rusin
2022-06-21 2:36 Stephen Rothwell
2022-06-21 7:48 ` Ville Syrjälä
2022-06-22 1:04 ` Stephen Rothwell
2022-06-22 13:55 ` Ville Syrjälä
2022-06-10 4:49 Stephen Rothwell
2022-06-10 9:23 ` Javier Martinez Canillas
2022-04-08 1:10 Stephen Rothwell
2022-04-08 8:17 ` Christian König
2022-04-06 0:50 Stephen Rothwell
2022-04-06 8:56 ` Paul Cercueil
2021-10-15 9:26 Stephen Rothwell
2021-10-15 9:56 ` Jani Nikula
2021-10-15 10:23 ` Stephen Rothwell
2021-11-01 8:42 ` Stephen Rothwell
2021-11-05 6:15 ` Stephen Rothwell
2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:57 ` Maxime Ripard
2021-11-06 2:33 ` Stephen Rothwell
2021-11-09 7:40 ` Jani Nikula
2021-11-09 9:16 ` Daniel Vetter
2021-11-09 11:09 ` Jani Nikula
2021-10-12 2:18 Stephen Rothwell
2021-10-12 11:29 ` Karol Herbst
[not found] ` <202110141102364478237@zte.com.cn>
2021-10-14 5:42 ` Karol Herbst
2021-09-17 7:09 Stephen Rothwell
2021-06-08 2:50 Stephen Rothwell
2021-06-08 5:37 ` Felix Kuehling
2021-06-08 6:55 ` Christian König
2021-06-08 7:06 ` Felix Kuehling
2021-06-08 7:11 ` Christian König
2021-06-09 13:48 ` Daniel Vetter
2021-06-07 2:33 Stephen Rothwell
2021-06-07 6:39 ` Christian König
2021-05-12 5:00 Stephen Rothwell
2021-05-12 18:58 ` Thomas Zimmermann
2021-02-10 3:11 Stephen Rothwell
2021-02-10 14:31 ` Maarten Lankhorst
2021-02-01 2:10 Stephen Rothwell
2021-01-14 0:31 Stephen Rothwell
2021-01-14 11:16 ` Thomas Zimmermann
2020-11-10 2:26 Stephen Rothwell
2020-11-02 1:43 Stephen Rothwell
2020-11-02 9:28 ` Daniel Vetter
2020-11-02 10:23 ` Michael S. Tsirkin
2020-11-02 10:28 ` Daniel Vetter
2020-11-02 10:27 ` Christoph Hellwig
2020-11-02 11:05 ` Michael S. Tsirkin
2020-11-02 10:19 ` Michael S. Tsirkin
2020-11-11 6:10 ` Stephen Rothwell
2020-11-11 12:48 ` Michael S. Tsirkin
2020-10-30 0:07 Stephen Rothwell
2020-10-30 7:53 ` Christian König
2020-10-08 3:09 Stephen Rothwell
2020-10-08 4:42 ` Stephen Rothwell
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
2020-10-13 11:12 ` Paul Cercueil
2020-08-26 0:55 Stephen Rothwell
2020-09-02 3:06 ` Stephen Rothwell
2020-06-17 0:59 Stephen Rothwell
2020-06-17 6:33 ` Thomas Zimmermann
2020-06-17 7:03 ` Stephen Rothwell
2020-06-17 19:06 ` Emil Velikov
2020-06-24 1:36 ` Stephen Rothwell
2020-06-24 5:47 ` Dave Airlie
2020-06-24 7:16 ` Stephen Rothwell
2020-04-20 3:01 Stephen Rothwell
2020-04-28 22:33 ` Stephen Rothwell
2020-04-29 8:09 ` Bartlomiej Zolnierkiewicz
2020-04-29 10:50 ` Bartlomiej Zolnierkiewicz
2019-12-16 1:23 Stephen Rothwell
2019-12-17 13:19 ` Daniel Vetter
2019-12-17 20:22 ` Stephen Rothwell
2019-12-18 11:53 ` Daniel Vetter
2019-10-16 0:22 Stephen Rothwell
2019-10-16 16:21 ` Alex Deucher
2019-10-09 0:35 Stephen Rothwell
2019-10-09 16:17 ` Alex Deucher
2019-10-07 23:30 Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
2019-08-28 8:55 Stephen Rothwell
2019-08-28 9:15 ` Gerd Hoffmann
2019-08-07 3:21 Stephen Rothwell
2019-08-01 2:30 Stephen Rothwell
2019-06-14 4:41 Stephen Rothwell
2019-04-09 6:08 Stephen Rothwell
2019-04-09 7:22 ` Gerd Hoffmann
2019-04-09 8:08 ` Stephen Rothwell
2019-04-09 8:31 ` Gerd Hoffmann
2019-04-05 4:55 Stephen Rothwell
2019-04-05 6:03 ` Stephen Rothwell
2019-04-01 23:50 Stephen Rothwell
2019-04-02 5:55 ` Qiang Yu
2019-04-02 7:57 ` Daniel Vetter
2019-04-02 8:59 ` Qiang Yu
2019-04-02 9:08 ` Daniel Vetter
2019-04-02 11:26 ` Matthew Wilcox
2019-04-02 13:56 ` Qiang Yu
2019-04-02 14:10 ` Matthew Wilcox
2019-04-02 11:21 ` Matthew Wilcox
2019-04-02 13:33 ` Qiang Yu
2019-02-08 1:38 Stephen Rothwell
2019-02-08 8:52 ` Daniel Vetter
2019-02-08 22:17 ` Sam Ravnborg
2019-01-08 0:12 Stephen Rothwell
2019-01-08 8:37 ` Daniel Vetter
2019-01-08 14:01 ` Kazlauskas, Nicholas
2019-01-09 0:29 ` Stephen Rothwell
2018-12-06 2:32 Stephen Rothwell
2018-12-07 12:37 ` Koenig, Christian
2017-12-06 1:00 Stephen Rothwell
2017-07-19 1:46 Stephen Rothwell
2017-07-21 0:08 ` Stephen Rothwell
2017-07-21 7:24 ` Daniel Vetter
2017-07-21 19:01 ` Hans de Goede
2017-07-24 0:03 ` Stephen Rothwell
2017-07-24 8:24 ` Daniel Vetter
2017-07-24 18:33 ` Greg KH
2017-07-18 1:38 Stephen Rothwell
2017-04-21 2:10 Stephen Rothwell
2017-04-21 5:03 ` Logan Gunthorpe
2017-04-24 1:25 ` Stephen Rothwell
2017-05-02 8:25 ` Daniel Vetter
2017-05-02 8:41 ` Stephen Rothwell
2017-05-02 8:55 ` Arnd Bergmann
2017-05-02 9:34 ` Daniel Vetter
2017-05-03 23:50 ` Stephen Rothwell
2017-04-03 3:31 Stephen Rothwell
2017-04-03 17:26 ` Sinclair Yeh
2017-01-05 0:53 Stephen Rothwell
2016-11-09 0:14 Stephen Rothwell
2016-10-24 0:24 Stephen Rothwell
2016-02-10 1:24 Stephen Rothwell
2016-02-10 6:31 ` Daniel Vetter
2016-02-10 8:41 ` Lukas Wunner
2016-02-10 13:17 ` Lukas Wunner
2016-02-10 13:37 ` Daniel Vetter
2015-12-08 0:20 Stephen Rothwell
2015-10-01 2:47 Stephen Rothwell
2015-10-01 6:41 ` Daniel Vetter
2015-09-03 0:49 Stephen Rothwell
2015-09-07 23:42 ` Stephen Rothwell
2015-09-08 4:48 ` Maarten Lankhorst
2015-09-08 8:16 ` Daniel Vetter
2015-07-14 2:52 Stephen Rothwell
2015-07-14 5:00 ` Archit Taneja
2015-07-14 7:36 ` Daniel Vetter
2015-02-24 0:41 Stephen Rothwell
2015-02-24 0:59 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®