On Thu, 14 Jul 2022 08:00:32 -0700, Christian König wrote: > > Am 14.07.22 um 15:33 schrieb Alex Deucher: > > On Thu, Jul 14, 2022 at 9:09 AM Christian König > > <christian.koenig@xxxxxxx> wrote: > >> Hi Mauro, > >> > >> well the last time I checked drm-tip was clean. > >> > >> The revert is necessary because we had some problems with the commit > >> which we couldn't fix in the 5.19 cycle. > > Would it be worth reverting the revert and applying the actual fix[1]? > > It's a huge revert unfortunately while the actual fix is like 10 > > lines of code. I'm concerned there will be subtle fallout from the > > revert due to how extensive it is. > > We have other bug fixes and cleanups around that patch which didn't made it > into 5.19 either. I don't want to create an ever greater mess. > > Real question is why building drm-tip work for me but not for others? Seeing this on latest drm-tip: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c:54:1: error: redefinition of ‘amdgpu_vram_mgr_first_block’ 54 | amdgpu_vram_mgr_first_block(struct list_head *list) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h:29, from drivers/gpu/drm/amd/amdgpu/amdgpu.h:73, from drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c:28: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h:57:1: note: previous definition of ‘amdgpu_vram_mgr_first_block’ with type ‘struct drm_buddy_block *(struct list_head *)’ 57 | amdgpu_vram_mgr_first_block(struct list_head *list) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c:59:20: error: redefinition of ‘amdgpu_is_vram_mgr_blocks_contiguous’ 59 | static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h:62:20: note: previous definition of ‘amdgpu_is_vram_mgr_blocks_contiguous’ with type ‘bool(struct list_head *)’ {aka ‘_Bool(struct list_head *)’} 62 | static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[4]: *** [scripts/Makefile.build:249: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [scripts/Makefile.build:466: drivers/gpu/drm/amd/amdgpu] Error 2 make[2]: *** [scripts/Makefile.build:466: drivers/gpu/drm] Error 2 make[1]: *** [scripts/Makefile.build:466: drivers/gpu] Error 2