Re: [PATCH] drm/amdgpu: fix drm-next merge fallout

2022-05-03 Thread Dave Airlie
On Tue, 3 May 2022 at 23:03, Alex Deucher wrote: > > On Tue, May 3, 2022 at 2:36 AM Christian König > wrote: > > > > That hunk somehow got missing while solving the conflict between the TTM > > and AMDGPU changes for drm-next. > > > > Signed-off-by: Christian König > > Acked-by: Alex Deucher >

Re: [PATCH] drm/amdgpu: fix drm-next merge fallout

2022-05-03 Thread Alex Deucher
On Tue, May 3, 2022 at 2:36 AM Christian König wrote: > > That hunk somehow got missing while solving the conflict between the TTM > and AMDGPU changes for drm-next. > > Signed-off-by: Christian König Acked-by: Alex Deucher > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 +- > 1 fil

[PATCH] drm/amdgpu: fix drm-next merge fallout

2022-05-02 Thread Christian König
That hunk somehow got missing while solving the conflict between the TTM and AMDGPU changes for drm-next. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.