linux-next: build failure after merge of the drm-misc tree
Subsystems (3)
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 <[email protected]>
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")
--- drivers/gpu/drm/xe/xe_bo.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +0 -11
@@ -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
Signature · 5 lines
2.43.0 -- Cheers, Stephen Rothwell
Patchwork
CI✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/129558/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/129558/revisions/1/mbox/ not applied
Applying: linux-next: build failure after merge of the drm-misc tree
Using index info to reconstruct a base tree...
M drivers/gpu/drm/xe/xe_bo.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/xe/xe_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Quoted 23 lines · Stephen Rothwell
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) 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 <[email protected]>
Date: Tue, 6 Feb 2024 12:21:07 +1100
Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
Quoted 8 lines
interacting with commit
dd08ebf6c352("drm/xe: Introduce a new DRM driver for Intel GPUs")Signed-off-by Stephen Rothwell <[email protected]>--- 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 <[email protected]>
M: Oded Gabbay <[email protected]>
M: Thomas Hellström <[email protected]>
L: [email protected]
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel
Thomas Hellström
maintainerHi
Quoted 12 lines · Stephen Rothwell
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) failed like this:Caused by commit
a78a8da51b36("drm/ttm: replace busy placement with flags v6")interacting with commit
Quoted 7 lines
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
Quoted 83 lines
From: Stephen Rothwell <[email protected]>
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 <[email protected]>---
drivers/gpu/drm/xe/xe_bo.c | 11 -----------1 file changed, 11 deletions(-)drivers/gpu/drm/xe/xe_bo.c +0
-2@@ -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 structttm_placett_placement_flags= {drivers/gpu/drm/xe/xe_bo.c +0
-2@@ -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, };
boolmem_type_is_vram(u32 mem_type)drivers/gpu/drm/xe/xe_bo.c +0
-2@@ -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;drivers/gpu/drm/xe/xe_bo.c +0
-1@@ -251,7 +245,6 @@ static void xe_evict_flags(structttm_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; }drivers/gpu/drm/xe/xe_bo.c +0
-2@@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(structxe_device *xe, bo->placement = (struct ttm_placement) { .num_placement = 1, .placement = place, - .num_busy_placement =1 , - .busy_placement = place, };
return 0;drivers/gpu/drm/xe/xe_bo.c +0
-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;drivers/gpu/drm/xe/xe_bo.c +0
-1- placement.num_busy_placement =1 ;placement.placement = &requested;
drivers/gpu/drm/xe/xe_bo.c +0
-1- placement.busy_placement = &requested;
/*
* Stolen needs to be handled like below VRAM handling if we ever needSignature · 1 line
2.43.0
Quoted 19 lines · Thomas Hellström
Hi
Quoted 16 lines · Stephen Rothwell
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) 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).
Quoted 8 lines
Quoted 3 lines
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
Thomas Hellström
maintainerQuoted 40 lines · Lucas De Marchi
Quoted 25 lines · Thomas Hellström
Hi
Quoted 15 lines · Stephen Rothwell
Hi all,
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) 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")Quoted 6 lines
(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 ...Quoted 5 lines
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
Quoted 1 line
Lucas De Marchi
Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping drm-misc maintainers.
/Thomas
Quoted 2 lines · Thomas Hellström
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.
Signature · 1 line
Jani Nikula, Intel
Hi all,
Quoted 3 lines · On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell <[email protected]> wrote:
After merging the drm-misc tree, today's linux-next build (
x86_64allmodconfig) 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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementdrivers/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_placementQuoted 9 lines
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.
Signature · 2 lines
Cheers, Stephen Rothwell