* Re: linux-next: build failure after merge of the drm-misc tree [not found] <20240206122822.12a2df89@canb.auug.org.au> @ 2024-02-06 11:46 ` Jani Nikula [not found] ` <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com> 1 sibling, 0 replies; 4+ 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] 4+ messages in thread
[parent not found: <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com>]
* Re: Re: linux-next: build failure after merge of the drm-misc tree [not found] ` <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com> @ 2024-02-06 20:21 ` Lucas De Marchi 2024-02-07 6:56 ` Thomas Hellström 0 siblings, 1 reply; 4+ 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] 4+ 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; 4+ 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] 4+ 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; 4+ 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] 4+ messages in thread
end of thread, other threads:[~2024-02-07 9:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240206122822.12a2df89@canb.auug.org.au>
2024-02-06 11:46 ` linux-next: build failure after merge of the drm-misc tree Jani Nikula
[not found] ` <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com>
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