| Message ID | 20191009113557.41ced49e@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the drm-misc tree | expand |
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
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
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(-)