* linux-next: build failure after merge of the drm-misc tree
@ 2019-10-09 0:35 Stephen Rothwell
2019-10-09 0:53 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-09 16:17 ` Alex Deucher
0 siblings, 2 replies; 5+ 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 related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2019-10-09 0:35 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
@ 2019-10-09 0:53 ` Patchwork
2019-10-09 16:17 ` Alex Deucher
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-10-09 0:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/67759/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
error: sha1 information is lacking or useless (drivers/gpu/drm/amd/amdkfd/kfd_priv.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2019-10-09 0:35 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-10-09 0:53 ` ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2019-10-09 16:17 ` Alex Deucher
1 sibling, 0 replies; 5+ 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] 5+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2024-02-06 1:28 Stephen Rothwell
@ 2024-02-06 1:28 ` Patchwork
0 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2024-02-06 1:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
2019-10-07 23:30 Stephen Rothwell
@ 2019-10-07 23:54 ` Patchwork
0 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-10-07 23:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/67718/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
error: sha1 information is lacking or useless (drivers/media/platform/cec-gpio/cec-gpio.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-06 1:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-09 0:35 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-10-09 0:53 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-09 16:17 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 1:28 Stephen Rothwell
2024-02-06 1:28 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-07 23:30 Stephen Rothwell
2019-10-07 23:54 ` ✗ Fi.CI.BUILD: failure for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.