* linux-next: build failure after merge of the drm-misc tree
@ 2025-07-15 3:55 Stephen Rothwell
2025-07-15 5:51 ` Andy Yan
0 siblings, 1 reply; 5+ 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] 5+ messages in thread* Re:linux-next: build failure after merge of the drm-misc tree
2025-07-15 3:55 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
@ 2025-07-15 5:51 ` Andy Yan
0 siblings, 0 replies; 5+ messages in thread
From: Andy Yan @ 2025-07-15 5:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simona Vetter, Andy Yan, Dmitry Baryshkov, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
Hi all,
At 2025-07-15 11:55:11, "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/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")
Sorry for this, I have sent a fix for this issue:
https://lore.kernel.org/dri-devel/20250715054754.800765-1-andyshrk@163.com/T/#u
>
>I have used the drm-misc tree from next-20250714 for today.
>
>--
>Cheers,
>Stephen Rothwell
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2024-02-06 1:28 Stephen Rothwell
2024-02-06 12:39 ` Thomas Hellström
0 siblings, 1 reply; 5+ 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 related [flat|nested] 5+ messages in thread* Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 linux-next: " Stephen Rothwell
@ 2024-02-06 12:39 ` Thomas Hellström
2024-02-06 20:21 ` Lucas De Marchi
0 siblings, 1 reply; 5+ 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] 5+ messages in thread* Re: Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 12:39 ` Thomas Hellström
@ 2024-02-06 20:21 ` Lucas De Marchi
2024-02-07 6:56 ` Thomas Hellström
0 siblings, 1 reply; 5+ messages in thread
From: Lucas De Marchi @ 2024-02-06 20:21 UTC (permalink / raw)
To: Thomas Hellström
Cc: Stephen Rothwell, Daniel Vetter, Matthew Brost, Rodrigo Vivi,
Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie,
intel-xe
On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote:
>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?
I think it should have been done in commit 4db102dcb039 ("Merge drm/drm-next into drm-misc-next")
when drm-next merged back into drm-misc-next. Now one option is probably a
commit on drm-misc-next with this content:
https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c
Lucas De Marchi
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Re: linux-next: build failure after merge of the drm-misc tree
2024-02-06 20:21 ` Lucas De Marchi
@ 2024-02-07 6:56 ` Thomas Hellström
2024-02-07 9:33 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Hellström @ 2024-02-07 6:56 UTC (permalink / raw)
To: Lucas De Marchi
Cc: Stephen Rothwell, Daniel Vetter, Matthew Brost, Rodrigo Vivi,
Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie,
intel-xe
On Tue, 2024-02-06 at 14:21 -0600, Lucas De Marchi wrote:
> On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote:
> > 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?
>
> I think it should have been done in commit 4db102dcb039 ("Merge
> drm/drm-next into drm-misc-next")
> when drm-next merged back into drm-misc-next. Now one option is
> probably a
> commit on drm-misc-next with this content:
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c
>
>
> Lucas De Marchi
Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping
drm-misc maintainers.
/Thomas
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Re: linux-next: build failure after merge of the drm-misc tree
2024-02-07 6:56 ` Thomas Hellström
@ 2024-02-07 9:33 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-02-07 9:33 UTC (permalink / raw)
To: Thomas Hellström, Lucas De Marchi
Cc: Stephen Rothwell, Daniel Vetter, Matthew Brost, Rodrigo Vivi,
Christian König, Somalapuram Amaranath, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie,
intel-xe
On Wed, 07 Feb 2024, Thomas Hellström <thomas.hellstrom@linux•intel.com> wrote:
> Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping
> drm-misc maintainers.
We'll need CONFIG_DRM_XE=m enabled in drm-rerere/drm-misc-*_defconfig,
and get people to use that.
BR,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-15 5:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-15 3:55 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2025-07-15 5:51 ` Andy Yan
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 1:28 linux-next: " Stephen Rothwell
2024-02-06 12:39 ` Thomas Hellström
2024-02-06 20:21 ` Lucas De Marchi
2024-02-07 6:56 ` Thomas Hellström
2024-02-07 9:33 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox