From: Alex Deucher <alexdeucher@gmail.com>
To: Dave Airlie <airlied@gmail.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>,
"amd-gfx list" <amd-gfx@lists.freedesktop.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>
Subject: Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13
Date: Wed, 7 Apr 2021 15:04:33 -0400 [thread overview]
Message-ID: <CADnq5_Ored1NxmDP5=_-5BXstsTdUPB31upM2AVFLXM1EXKQzQ@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9twymi8Emi+GpDW0Gz_OQ63BGwwzKwF_Jxq8=i_VC9U=3w@mail.gmail.com>
On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > On Fri, Apr 2, 2021 at 12:22 PM Christian König
> > <ckoenig.leichtzumerken@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.
Alex
>
> Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Alex Deucher <alexdeucher@gmail.com>
To: Dave Airlie <airlied@gmail.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>,
"amd-gfx list" <amd-gfx@lists.freedesktop.org>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>
Subject: Re: [pull] amdgpu, radeon, ttm, sched drm-next-5.13
Date: Wed, 7 Apr 2021 15:04:33 -0400 [thread overview]
Message-ID: <CADnq5_Ored1NxmDP5=_-5BXstsTdUPB31upM2AVFLXM1EXKQzQ@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9twymi8Emi+GpDW0Gz_OQ63BGwwzKwF_Jxq8=i_VC9U=3w@mail.gmail.com>
On Wed, Apr 7, 2021 at 3:23 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Wed, 7 Apr 2021 at 06:54, Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > On Fri, Apr 2, 2021 at 12:22 PM Christian König
> > <ckoenig.leichtzumerken@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.
Alex
>
> Dave.
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-04-07 19:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 22:29 [pull] amdgpu, radeon, ttm, sched drm-next-5.13 Alex Deucher
2021-04-01 22:29 ` Alex Deucher
2021-04-02 16:22 ` Christian König
2021-04-02 16:22 ` Christian König
2021-04-06 20:54 ` Alex Deucher
2021-04-06 20:54 ` Alex Deucher
2021-04-07 7:23 ` Dave Airlie
2021-04-07 7:23 ` Dave Airlie
2021-04-07 19:04 ` Alex Deucher [this message]
2021-04-07 19:04 ` Alex Deucher
2021-04-08 7:13 ` Christian König
2021-04-08 7:13 ` Christian König
2021-04-08 10:28 ` Christian König
2021-04-08 10:28 ` Christian König
2021-04-08 13:03 ` Alex Deucher
2021-04-08 13:03 ` Alex Deucher
2021-04-09 9:07 ` Christian König
2021-04-09 9:07 ` Christian König
2021-04-09 19:50 ` Dave Airlie
2021-04-09 19:50 ` Dave Airlie
2021-04-06 15:42 ` Felix Kuehling
2021-04-06 15:42 ` Felix Kuehling
2021-04-06 15:48 ` Alex Deucher
2021-04-06 15:48 ` Alex Deucher
2021-04-07 6:56 ` Christian König
2021-04-07 6:56 ` Christian König
2021-04-07 8:50 ` Chen, Guchun
2021-04-07 8:50 ` Chen, Guchun
2021-04-07 10:37 ` Christian König
2021-04-07 10:37 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_Ored1NxmDP5=_-5BXstsTdUPB31upM2AVFLXM1EXKQzQ@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.