From: Dave Airlie <airlied@gmail.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>,
"DRM maintainer tools announcements, discussion,
and development" <dim-tools@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Sean Paul <sean@poorly.run>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PULL] topic/i915-ttm
Date: Sat, 19 Jun 2021 06:02:47 +1000 [thread overview]
Message-ID: <CAPM=9txge9msRdi2jLRnvrPOeup4jND3-pK0SPr+H0TRzpU1SA@mail.gmail.com> (raw)
In-Reply-To: <162366341949.32491.14244869174585877634@jlahtine-mobl.ger.corp.intel.com>
On Mon, 14 Jun 2021 at 19:37, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > > Pull request for drm-misc-next and drm-intel-gt-next.
> > > >
> > > > topic/i915-ttm-2021-06-11:
> > > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > > - Convert i915 lmem handling to ttm.
> > > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > > - Use this to allow mixed object mmap handling for i915.
> > > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > > >
> > > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> > >
> > > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > > we would end up pulling 478 extra commits from drm-next as a result. And
> > > also causing all the warnings for those commits. I don't think we should
> > > do that?
> > >
> > > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > > Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
>
> And now I have actually pushed the merge too.. Thanks to Tvrtko
> for pointing out broken drm-tip.
>
Sorry I messed up, I missed the tip fail in my terminal before I clocked off.
Dave.
WARNING: multiple messages have this Message-ID (diff)
From: Dave Airlie <airlied@gmail.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>,
"DRM maintainer tools announcements, discussion,
and development" <dim-tools@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
Maxime Ripard <mripard@kernel.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PULL] topic/i915-ttm
Date: Sat, 19 Jun 2021 06:02:47 +1000 [thread overview]
Message-ID: <CAPM=9txge9msRdi2jLRnvrPOeup4jND3-pK0SPr+H0TRzpU1SA@mail.gmail.com> (raw)
In-Reply-To: <162366341949.32491.14244869174585877634@jlahtine-mobl.ger.corp.intel.com>
On Mon, 14 Jun 2021 at 19:37, Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Joonas Lahtinen (2021-06-11 14:13:02)
> > Quoting Joonas Lahtinen (2021-06-11 13:40:56)
> > > Quoting Maarten Lankhorst (2021-06-11 12:27:15)
> > > > Pull request for drm-misc-next and drm-intel-gt-next.
> > > >
> > > > topic/i915-ttm-2021-06-11:
> > > > drm-misc and drm-intel pull request for topic/i915-ttm:
> > > > - Convert i915 lmem handling to ttm.
> > > > - Add a patch to temporarily add a driver_private member to vma_node.
> > > > - Use this to allow mixed object mmap handling for i915.
> > > > The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
> > > >
> > > > Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
> > >
> > > This base is not in drm-misc-next or drm-intel-gt-next, so effectively
> > > we would end up pulling 478 extra commits from drm-next as a result. And
> > > also causing all the warnings for those commits. I don't think we should
> > > do that?
> > >
> > > The common ancestor would be ccd1950c2f7e38ae45aeefb99a08b39407cd6c63
> > > "Merge tag 'drm-intel-gt-next-2021-05-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next"
> > > Should we re-do the topic branch based on that?
> >
> > This problem seems to come from the fact that only the PR from yesterday
> > that got merged to drm-next had the dependency patches. The previous
> > backmerge of drm-next was requested too early.
> >
> > I've solved this with least hassle by backmerging drm-next again and
> > then applying the PR to drm-intel-gt-next.
>
> And now I have actually pushed the merge too.. Thanks to Tvrtko
> for pointing out broken drm-tip.
>
Sorry I messed up, I missed the tip fail in my terminal before I clocked off.
Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-18 20:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 9:27 [PULL] topic/i915-ttm Maarten Lankhorst
2021-06-11 9:27 ` [Intel-gfx] " Maarten Lankhorst
2021-06-11 10:40 ` Joonas Lahtinen
2021-06-11 10:40 ` [Intel-gfx] " Joonas Lahtinen
2021-06-11 11:13 ` Joonas Lahtinen
2021-06-11 11:13 ` [Intel-gfx] " Joonas Lahtinen
2021-06-11 12:50 ` Thomas Hellström (Intel)
2021-06-13 18:54 ` Thomas Zimmermann
2021-06-13 18:54 ` [Intel-gfx] " Thomas Zimmermann
2021-06-14 6:46 ` Joonas Lahtinen
2021-06-14 6:46 ` [Intel-gfx] " Joonas Lahtinen
2021-06-14 7:21 ` Thomas Zimmermann
2021-06-14 7:21 ` [Intel-gfx] " Thomas Zimmermann
2021-06-14 9:36 ` Joonas Lahtinen
2021-06-14 9:36 ` [Intel-gfx] " Joonas Lahtinen
2021-06-18 20:02 ` Dave Airlie [this message]
2021-06-18 20:02 ` Dave Airlie
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='CAPM=9txge9msRdi2jLRnvrPOeup4jND3-pK0SPr+H0TRzpU1SA@mail.gmail.com' \
--to=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dim-tools@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=sean@poorly.run \
--cc=thellstrom@vmware.com \
/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.