From: Daniel Vetter <daniel@ffwll.ch>
To: "Christian König" <christian.koenig@amd.com>
Cc: Felix Kuehling <felix.kuehling@amd.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel@ffwll.ch>,
Alex Deucher <alexander.deucher@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm-misc tree
Date: Wed, 9 Jun 2021 15:48:03 +0200 [thread overview]
Message-ID: <YMDGkyhvVAufp68p@phenom.ffwll.local> (raw)
In-Reply-To: <d06e7d13-f24d-40f9-64bd-2b6e45d74462@amd.com>
On Tue, Jun 08, 2021 at 09:11:57AM +0200, Christian König wrote:
> Am 08.06.21 um 09:06 schrieb Felix Kuehling:
> > Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
> > > Hi Felix,
> > >
> > > that should already be fixed in drm-tip as part of the merge of the
> > > TTM changes.
> > No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
> > drm-next, but that doesn't seem to have the TTM changes yet.
> >
> > Is there another DRM branch or repository that you're referring to with
> > drm-tip?
>
> drm-tip is an integration branch for conflict resolution.
>
> E.g. when we have changes in drm-misc-next which break when we merge with
> drm-next I'm informed and need to provide a conflict resolution patch.
>
> This is automatically applied when drm-next and drm-misc-next are merged
> together again.
>
> It just looks like that drm-next and drm-misc-next are merged manually into
> linux-next and then the conflict resolution doesn't apply and everything
> breaks into pieces.
>
> Adding Daniel as well. How should that be handled? Should we merge
> drm-misc-next into drm-next now?
Yeah I'm expecting there will be a pull request this week. I've given Dave
Airlie a headsup that the conflict is "interesting" and that maybe he
needs to push out a test branch for you and Thomas Hellstrom to
review/test first.
-Daniel
>
> Thanks,
> Christian.
>
> >
> > Regards,
> > Fel
> >
> > > Regards,
> > > Christian.
> > >
> > > Am 08.06.21 um 07:37 schrieb Felix Kuehling:
> > > > Hi Christian,
> > > >
> > > > I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
> > > > changed there. Looks like I'll need to create a dummy node in
> > > > amdgpu_preempt_mgr_new to satisfy TTM, and free it in
> > > > amdgpu_preempt_mgr_del.
> > > >
> > > > Thanks,
> > > > Felix
> > > >
> > > >
> > > > Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
> > > > > Hi all,
> > > > >
> > > > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > > > allmodconfig) failed like this:
> > > > >
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
> > > > > 'amdgpu_preempt_mgr_new':
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
> > > > > ttm_resource' has no member named 'mm_node'
> > > > > 75 | mem->mm_node = NULL;
> > > > > | ^~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
> > > > > initialization of 'int (*)(struct ttm_resource_manager *, struct
> > > > > ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
> > > > > **)' from incompatible pointer type 'int (*)(struct
> > > > > ttm_resource_manager *, struct ttm_buffer_object *, const struct
> > > > > ttm_place *, struct ttm_resource *)'
> > > > > [-Werror=incompatible-pointer-types]
> > > > > 129 | .alloc = amdgpu_preempt_mgr_new,
> > > > > | ^~~~~~~~~~~~~~~~~~~~~~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
> > > > > initialization for 'amdgpu_preempt_mgr_func.alloc')
> > > > >
> > > > > Caused by commit
> > > > >
> > > > > cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
> > > > > resources v2")
> > > > >
> > > > > from the drm-misc tree interacting with commit
> > > > >
> > > > > b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
> > > > > BOs")
> > > > >
> > > > > from the drm tree.
> > > > >
> > > > > I don't know how to fix this, so I added the following hack (a better
> > > > > fix would be nice):
> > > > >
> > > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > > Date: Tue, 8 Jun 2021 12:41:16 +1000
> > > > > Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
> > > > >
> > > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > > ---
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
> > > > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > index d607f314cc1b..e1a7b3e967b9 100644
> > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
> > > > > static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
> > > > > struct ttm_buffer_object *tbo,
> > > > > const struct ttm_place *place,
> > > > > - struct ttm_resource *mem)
> > > > > + struct ttm_resource **res)
> > > > > {
> > > > > +#if 0
> > > > > struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> > > > > atomic64_add(mem->num_pages, &mgr->used);
> > > > > mem->mm_node = NULL;
> > > > > mem->start = AMDGPU_BO_INVALID_OFFSET;
> > > > > +#endif
> > > > > return 0;
> > > > > }
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-06-09 13:48 UTC|newest]
Thread overview: 193+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 2:50 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2021-06-08 5:37 ` Felix Kuehling
2021-06-08 6:55 ` Christian König
2021-06-08 7:06 ` Felix Kuehling
2021-06-08 7:11 ` Christian König
2021-06-09 13:48 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-02 23:47 Stephen Rothwell
2024-02-22 1:46 Stephen Rothwell
2024-02-22 8:14 ` Biju Das
2024-02-22 8:29 ` Geert Uytterhoeven
2024-02-22 9:16 ` Biju Das
2024-02-22 8:32 ` Maxime Ripard
2024-02-22 8:49 ` Biju Das
2024-02-13 1:04 Stephen Rothwell
2024-02-12 1:26 Stephen Rothwell
2024-02-12 9:12 ` Jani Nikula
2024-02-12 13:09 ` Jani Nikula
2024-02-06 4:28 Stephen Rothwell
2024-02-12 1:25 ` Stephen Rothwell
2024-02-12 13:15 ` Jani Nikula
2024-02-19 21:48 ` Stephen Rothwell
2024-02-25 21:41 ` Stephen Rothwell
2024-02-25 21:47 ` Stephen Rothwell
2024-02-26 12:56 ` Christian König
2024-02-06 1:28 Stephen Rothwell
2024-02-06 11:46 ` Jani Nikula
2024-02-06 12:39 ` Thomas Hellström
2024-02-07 2:46 ` Stephen Rothwell
2023-11-26 23:38 Stephen Rothwell
2023-11-27 2:12 ` Luben Tuikov
2023-10-12 1:22 Stephen Rothwell
2023-10-12 1:27 ` Stephen Rothwell
2023-10-12 7:09 ` Greg Kroah-Hartman
2023-10-20 2:00 ` Stephen Rothwell
2023-08-07 1:36 Stephen Rothwell
2023-04-03 2:16 Stephen Rothwell
2023-04-03 8:51 ` Qiang Yu
2023-04-04 1:14 ` Stephen Rothwell
2022-11-17 7:32 Stephen Rothwell
2022-11-23 5:20 ` Stephen Rothwell
2022-11-23 5:35 ` David Airlie
2022-11-23 6:22 ` Stephen Rothwell
2022-11-23 8:33 ` Thomas Zimmermann
2022-11-16 0:38 Stephen Rothwell
2022-11-10 0:10 Stephen Rothwell
2022-10-21 0:02 Stephen Rothwell
2022-10-21 1:11 ` Zack Rusin
2022-06-21 2:36 Stephen Rothwell
2022-06-21 7:48 ` Ville Syrjälä
2022-06-22 1:04 ` Stephen Rothwell
2022-06-22 13:55 ` Ville Syrjälä
2022-06-10 4:49 Stephen Rothwell
2022-06-10 9:23 ` Javier Martinez Canillas
2022-04-08 1:10 Stephen Rothwell
2022-04-08 8:17 ` Christian König
2022-04-06 0:50 Stephen Rothwell
2022-04-06 8:56 ` Paul Cercueil
2021-10-15 9:26 Stephen Rothwell
2021-10-15 9:56 ` Jani Nikula
2021-10-15 10:23 ` Stephen Rothwell
2021-11-01 8:42 ` Stephen Rothwell
2021-11-05 6:15 ` Stephen Rothwell
2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:57 ` Maxime Ripard
2021-11-06 2:33 ` Stephen Rothwell
2021-11-09 7:40 ` Jani Nikula
2021-11-09 9:16 ` Daniel Vetter
2021-11-09 11:09 ` Jani Nikula
2021-10-12 2:18 Stephen Rothwell
2021-10-12 11:29 ` Karol Herbst
[not found] ` <202110141102364478237@zte.com.cn>
2021-10-14 5:42 ` Karol Herbst
2021-09-17 7:09 Stephen Rothwell
2021-06-07 2:33 Stephen Rothwell
2021-06-07 6:39 ` Christian König
2021-05-12 5:00 Stephen Rothwell
2021-05-12 18:58 ` Thomas Zimmermann
2021-02-10 3:11 Stephen Rothwell
2021-02-10 14:31 ` Maarten Lankhorst
2021-02-01 2:10 Stephen Rothwell
2021-01-14 0:31 Stephen Rothwell
2021-01-14 11:16 ` Thomas Zimmermann
2020-11-10 2:26 Stephen Rothwell
2020-11-02 1:43 Stephen Rothwell
2020-11-02 9:28 ` Daniel Vetter
2020-11-02 10:23 ` Michael S. Tsirkin
2020-11-02 10:28 ` Daniel Vetter
2020-11-02 10:27 ` Christoph Hellwig
2020-11-02 11:05 ` Michael S. Tsirkin
2020-11-02 10:19 ` Michael S. Tsirkin
2020-11-11 6:10 ` Stephen Rothwell
2020-11-11 12:48 ` Michael S. Tsirkin
2020-10-30 0:07 Stephen Rothwell
2020-10-30 7:53 ` Christian König
2020-10-08 3:09 Stephen Rothwell
2020-10-08 4:42 ` Stephen Rothwell
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
2020-10-13 11:12 ` Paul Cercueil
2020-08-26 0:55 Stephen Rothwell
2020-09-02 3:06 ` Stephen Rothwell
2020-06-17 0:59 Stephen Rothwell
2020-06-17 6:33 ` Thomas Zimmermann
2020-06-17 7:03 ` Stephen Rothwell
2020-06-17 19:06 ` Emil Velikov
2020-06-24 1:36 ` Stephen Rothwell
2020-06-24 5:47 ` Dave Airlie
2020-06-24 7:16 ` Stephen Rothwell
2020-04-20 3:01 Stephen Rothwell
2020-04-28 22:33 ` Stephen Rothwell
2020-04-29 8:09 ` Bartlomiej Zolnierkiewicz
2020-04-29 10:50 ` Bartlomiej Zolnierkiewicz
2019-12-16 1:23 Stephen Rothwell
2019-12-17 13:19 ` Daniel Vetter
2019-12-17 20:22 ` Stephen Rothwell
2019-12-18 11:53 ` Daniel Vetter
2019-10-16 0:22 Stephen Rothwell
2019-10-16 16:21 ` Alex Deucher
2019-10-09 0:35 Stephen Rothwell
2019-10-09 16:17 ` Alex Deucher
2019-10-07 23:30 Stephen Rothwell
2019-10-08 3:02 ` Stephen Rothwell
2019-10-08 7:56 ` Hans Verkuil
2019-10-14 0:12 ` Stephen Rothwell
2019-08-28 8:55 Stephen Rothwell
2019-08-28 9:15 ` Gerd Hoffmann
2019-08-07 3:21 Stephen Rothwell
2019-08-01 2:30 Stephen Rothwell
2019-06-14 4:41 Stephen Rothwell
2019-04-09 6:08 Stephen Rothwell
2019-04-09 7:22 ` Gerd Hoffmann
2019-04-09 8:08 ` Stephen Rothwell
2019-04-09 8:31 ` Gerd Hoffmann
2019-04-05 4:55 Stephen Rothwell
2019-04-05 6:03 ` Stephen Rothwell
2019-04-01 23:50 Stephen Rothwell
2019-04-02 5:55 ` Qiang Yu
2019-04-02 7:57 ` Daniel Vetter
2019-04-02 8:59 ` Qiang Yu
2019-04-02 9:08 ` Daniel Vetter
2019-04-02 11:26 ` Matthew Wilcox
2019-04-02 13:56 ` Qiang Yu
2019-04-02 14:10 ` Matthew Wilcox
2019-04-02 11:21 ` Matthew Wilcox
2019-04-02 13:33 ` Qiang Yu
2019-02-08 1:38 Stephen Rothwell
2019-02-08 8:52 ` Daniel Vetter
2019-02-08 22:17 ` Sam Ravnborg
2019-01-08 0:12 Stephen Rothwell
2019-01-08 8:37 ` Daniel Vetter
2019-01-08 14:01 ` Kazlauskas, Nicholas
2019-01-09 0:29 ` Stephen Rothwell
2018-12-06 2:32 Stephen Rothwell
2018-12-07 12:37 ` Koenig, Christian
2017-12-06 1:00 Stephen Rothwell
2017-07-19 1:46 Stephen Rothwell
2017-07-21 0:08 ` Stephen Rothwell
2017-07-21 7:24 ` Daniel Vetter
2017-07-21 19:01 ` Hans de Goede
2017-07-24 0:03 ` Stephen Rothwell
2017-07-24 8:24 ` Daniel Vetter
2017-07-24 18:33 ` Greg KH
2017-07-18 1:38 Stephen Rothwell
2017-04-21 2:10 Stephen Rothwell
2017-04-21 5:03 ` Logan Gunthorpe
2017-04-24 1:25 ` Stephen Rothwell
2017-05-02 8:25 ` Daniel Vetter
2017-05-02 8:41 ` Stephen Rothwell
2017-05-02 8:55 ` Arnd Bergmann
2017-05-02 9:34 ` Daniel Vetter
2017-05-03 23:50 ` Stephen Rothwell
2017-04-03 3:31 Stephen Rothwell
2017-04-03 17:26 ` Sinclair Yeh
2017-01-05 0:53 Stephen Rothwell
2016-11-09 0:14 Stephen Rothwell
2016-10-24 0:24 Stephen Rothwell
2016-02-10 1:24 Stephen Rothwell
2016-02-10 6:31 ` Daniel Vetter
2016-02-10 8:41 ` Lukas Wunner
2016-02-10 13:17 ` Lukas Wunner
2016-02-10 13:37 ` Daniel Vetter
2015-12-08 0:20 Stephen Rothwell
2015-10-01 2:47 Stephen Rothwell
2015-10-01 6:41 ` Daniel Vetter
2015-09-03 0:49 Stephen Rothwell
2015-09-07 23:42 ` Stephen Rothwell
2015-09-08 4:48 ` Maarten Lankhorst
2015-09-08 8:16 ` Daniel Vetter
2015-07-14 2:52 Stephen Rothwell
2015-07-14 5:00 ` Archit Taneja
2015-07-14 7:36 ` Daniel Vetter
2015-02-24 0:41 Stephen Rothwell
2015-02-24 0:59 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMDGkyhvVAufp68p@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=felix.kuehling@amd.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).