Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, On Tue, 3 Nov 2020 14:21:08 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > between commit: > > e8a982355f96 ("drm/amd/display: Add tracepoint for amdgpu_dm") > > from

Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, On Wed, 28 Oct 2020 12:06:31 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > > between commit: > > ff72bc403170 ("drm/amdgpu: Add debugfs entry for printing VM info") > > from the

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commit: e8a982355f96 ("drm/amd/display: Add tracepoint for amdgpu_dm") from the amdgpu tree and commit: 29b77ad7b9ca ("drm/atomic: Pass the full state to

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c between commit: ff72bc403170 ("drm/amdgpu: Add debugfs entry for printing VM info") from the amdgpu tree and commit: 4671078eb8e3 ("drm/amdgpu: switch over to the new pin

Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, On Wed, 26 Aug 2020 10:18:53 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c between commits: cacbbe7c0065 ("drm/amdgpu:

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo_util.c between commit: 6d9d5ba31dd1 ("drm/ttm: Refactor ttm_bo_pipeline_move") from the amdgpu tree and commit: ef38321897cf ("drm/ttm: use the parent resv for ghost objects v3") from

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 274840e54422 ("drm/ttm: Add release_notify callback to ttm_bo_driver") from the amdgpu tree and commit: b96f3e7c8069 ("drm/ttm: use gem vma_node") from the drm-misc

Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, On Wed, 12 Jun 2019 11:46:15 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/dc/dce/dce_audio.c > > between commit: > > c7c7192c56d2 ("drm/amd/display: add audio related regs") > >

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/display/dc/dce/dce_audio.c between commit: c7c7192c56d2 ("drm/amd/display: add audio related regs") from the amdgpu tree and commit: 4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h")

linux-next: manual merge of the drm-misc tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c between commit: 56965ce261af ("drm/amdgpu: cancel late_init_work before gpu reset") from the amdgpu tree and commit: 1d721ed679db ("drm/amdgpu: Avoid HW reset if guilty