<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <p style="font-family:Arial;font-size:10pt;color:#317100;margin:15pt;" align="Left"> [AMD Public Use]<br> </p> <br> <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Double check for mis-merges on patches that went upstream via -fixes and -next.</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Alex<br> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Christian König <ckoenig.leichtzumerken@gmail.com><br> <b>Sent:</b> Tuesday, August 18, 2020 11:06 AM<br> <b>To:</b> Thomas Zimmermann <tzimmermann@suse.de>; Koenig, Christian <Christian.Koenig@amd.com>; Alex Deucher <alexdeucher@gmail.com><br> <b>Cc:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Subject:</b> Re: TTM/nouveau conflict in drm-misc-next</font> <div> </div> </div> <div> <div class="x_moz-cite-prefix">Am 17.08.20 um 08:31 schrieb Thomas Zimmermann:<br> </div> <blockquote type="cite"> <pre class="x_moz-quote-pre">Hi Am 14.08.20 um 18:21 schrieb Koenig, Christian: </pre> <blockquote type="cite"> <pre class="x_moz-quote-pre"> Am 14.08.2020 17:53 schrieb Alex Deucher <a class="x_moz-txt-link-rfc2396E" href="mailto:alexdeucher@gmail.com"><alexdeucher@gmail.com></a>: On Fri, Aug 14, 2020 at 11:22 AM Christian König <a class="x_moz-txt-link-rfc2396E" href="mailto:christian.koenig@amd.com"><christian.koenig@amd.com></a> 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? </pre> </blockquote> <pre class="x_moz-quote-pre"> The backmerge brought in Fixes: 16e6eea29d7b ("Merge tag 'amd-drm-fixes-5.9-2020-08-07' ...) which has quite a few commit. Maybe it's in one of them.</pre> </blockquote> <br> Nope, I have just double checked that I can revert either parent of the merge and the problem disappears.<br> <br> I somehow need to figure out how to cleanly revert all patches in one branch one by one and then do a reverse bisect. Oh, sometimes I love my job :(<br> <br> If anybody has a good idea how to do this please speak up.<br> <br> Thanks,<br> Christian.<br> <br> <blockquote type="cite"> <pre class="x_moz-quote-pre"> Best regards Thomas </pre> <blockquote type="cite"> <pre class="x_moz-quote-pre"> 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 > <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> > <a class="x_moz-txt-link-freetext" href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CAlexander.Deucher%40amd.com%7Cd4023becdee744c639ae08d843885b15%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637333600213437608&sdata=pbqERBZPwTFVObebH8KIPIxOtDYrjMu4SIaJ%2FF13cXk%3D&reserved=0" originalsrc="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" shash="xLe14aGwWJOJT9nppIbAA/DNx4rObDXp7SC2pJZhOGPvq60R5rdvfAfYFetOOz1lZwTP5eomqbUKpbRQRtf/UKh3AYVBq/Uyd4fqhUok76UDTMuH2XKIrZ6cz7+MT8zb1vS9z+9O/9Gtkr6gPVnHrQkkfPboxmHsZC2nmMZ/ILs=">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> </pre> </blockquote> <pre class="x_moz-quote-pre"> </pre> <br> <fieldset class="x_mimeAttachmentHeader"></fieldset> <pre class="x_moz-quote-pre">_______________________________________________ amd-gfx mailing list <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <a class="x_moz-txt-link-freetext" href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CAlexander.Deucher%40amd.com%7Cd4023becdee744c639ae08d843885b15%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637333600213447604&sdata=r8BFPhKT1KzcpVZQIy0Im4%2Bjb9S75c7doKvtH2FGjA8%3D&reserved=0" originalsrc="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" shash="Wwkwr+CK7NfcXLMTNUW/gYRiKOckfoc29e0lxKXrsBa6WpgE8Rp5kRBA1U23+dswS5OHeJuCSe6k/nrMwx2sFp1qX3hfF5YxhtfikcsI9hMtoVYxTcdfwaHCSwyYniunzlQgvLkL243FjgzTLxKTzwOP43H/EgO9I0fyFKdUSeY=">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a> </pre> </blockquote> <br> </div> </div> </body> </html>