[AMD Public Use]
Double check for mis-merges on patches that went upstream via -fixes and -next.
Alex
From: Christian König <ckoenig.leichtzumerken@xxxxxxxxx>
Sent: Tuesday, August 18, 2020 11:06 AM To: Thomas Zimmermann <tzimmermann@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; Alex Deucher <alexdeucher@xxxxxxxxx> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx> Subject: Re: TTM/nouveau conflict in drm-misc-next Am 17.08.20 um 08:31 schrieb Thomas Zimmermann:
Hi Am 14.08.20 um 18:21 schrieb Koenig, Christian:Am 14.08.2020 17:53 schrieb Alex Deucher <alexdeucher@xxxxxxxxx>: On Fri, Aug 14, 2020 at 11:22 AM Christian König <christian.koenig@xxxxxxx> 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?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. Nope, I have just double checked that I can revert either parent of the merge and the problem disappears. 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 :( If anybody has a good idea how to do this please speak up. Thanks, Christian. Best regards ThomasChristian. 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@xxxxxxxxxxxxxxxxxxxxx > https://nam11.safelinks.protection.outlook.com/?url=""> |
_______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx