TTM/nouveau conflict in drm-misc-next

[Koenig, Christian]

Am 14.08.2020 17:53 schrieb Alex Deucher <alexdeucher at gmail.com>:
On Fri, Aug 14, 2020 at 11:22 AM Christian König
<christian.koenig at amd.com> wrote:
>
> Hey Thomas & Alex,
>
> well the TTM and Nouveau changes look good to me, but this completely
> broke amdgpu.
>
> Alex any idea what is going on here?

What's broken in amdgpu?  There shouldn't be any ttm changes in amdgpu
for drm-next.  Those all go through drm-misc.

It's not a TTM change.

The backmerge of drm-next into drm-misc-next broke amdgpu so that even glxgears doesn't work anymore.

But each individual merge head still works fine as far as I can say.

Any idea how to track that down?

Christian.


Alex

>
> Regards,
> Christian.
>
> Am 12.08.20 um 21:10 schrieb Thomas Zimmermann:
> > Hi Christian and Ben,
> >
> > I backmerged drm-next into drm-misc-next and had a conflict between ttm
> > and nouveau. struct ttm_mem_res got renamed to struct ttm_resource. I
> > updated nouveau to the new name, test-built, and pushed the result to
> > drm-misc-next. If either of you has a minute, you may want to double
> > check the merge.
> >
> > Best regards
> > Thomas
> >
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cchristian.koenig%40amd.com%7Ca1aefc1ee22a4e733df908d8406a395c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637330172275088649&sdata=X2ZJUETwoq884Xtg66sDudjXB%2F3s%2BgRglnh33gpU4Hc%3D&reserved=0

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20200814/e9ca2acb/attachment.htm>