<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> <div dir="auto"> <div><br> <div class="gmail_extra"><br> <div class="gmail_quote">Am 14.08.2020 17:53 schrieb Alex Deucher <alexdeucher@gmail.com>:<br type="attribution"> <blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div><font size="2"><span style="font-size:11pt"> <div>On Fri, Aug 14, 2020 at 11:22 AM Christian König<br> <christian.koenig@amd.com> wrote:<br> ><br> > Hey Thomas & Alex,<br> ><br> > well the TTM and Nouveau changes look good to me, but this completely<br> > broke amdgpu.<br> ><br> > Alex any idea what is going on here?<br> <br> What's broken in amdgpu? There shouldn't be any ttm changes in amdgpu<br> for drm-next. Those all go through drm-misc.<br> </div> </span></font></div> </blockquote> </div> </div> </div> <div dir="auto"><br> </div> <div dir="auto">It's not a TTM change.</div> <div dir="auto"><br> </div> <div dir="auto">The backmerge of drm-next into drm-misc-next broke amdgpu so that even glxgears doesn't work anymore.</div> <div dir="auto"><br> </div> <div dir="auto">But each individual merge head still works fine as far as I can say.</div> <div dir="auto"><br> </div> <div dir="auto">Any idea how to track that down?</div> <div dir="auto"><br> </div> <div dir="auto">Christian.</div> <div dir="auto"><br> </div> <div dir="auto"> <div class="gmail_extra"> <div class="gmail_quote"> <blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div><font size="2"><span style="font-size:11pt"> <div><br> Alex<br> <br> ><br> > Regards,<br> > Christian.<br> ><br> > Am 12.08.20 um 21:10 schrieb Thomas Zimmermann:<br> > > Hi Christian and Ben,<br> > ><br> > > I backmerged drm-next into drm-misc-next and had a conflict between ttm<br> > > and nouveau. struct ttm_mem_res got renamed to struct ttm_resource. I<br> > > updated nouveau to the new name, test-built, and pushed the result to<br> > > drm-misc-next. If either of you has a minute, you may want to double<br> > > check the merge.<br> > ><br> > > Best regards<br> > > Thomas<br> > ><br> ><br> > _______________________________________________<br> > amd-gfx mailing list<br> > amd-gfx@lists.freedesktop.org<br> > <a href="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"> 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</a><br> </div> </span></font></div> </blockquote> </div> <br> </div> </div> </div> </body> </html>