[pull] amdgpu, radeon, ttm, sched drm-next-5.13

[Christian König]

Am 07.04.21 um 21:04 schrieb Alex Deucher:
> On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied at gmail.com> wrote:
>> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher at gmail.com> wrote:
>>> On Fri, Apr 2, 2021 at 12:22 PM Christian König
>>> <ckoenig.leichtzumerken at gmail.com> wrote:
>>>> Hey Alex,
>>>>
>>>> the TTM and scheduler changes should already be in the drm-misc-next
>>>> branch (not 100% sure about the TTM patch, need to double check next week).
>>>>
>>> The TTM change is not in drm-misc yet.
>>>
>>>> Could that cause problems when both are merged into drm-next?
>>> Dave, Daniel, how do you want to handle this?  The duplicated patch is this one:
>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ac4eb83ab255de9c31184df51fd1534ba36fd212
>>> amdgpu has changes which depend on it.  The same patch is included in this PR.
>> Ouch not sure how best to sync up here, maybe get misc-next into my
>> tree then rebase your tree on top of it?
> I can do that.

Please let me double check later today that we have everything we need 
in drm-misc-next.

Regards,
Christian.

>
> Alex
>
>
>> Dave.