On Thu, 15 Oct 2020 at 11:33, Dave Airlie <airlied@xxxxxxxxx> wrote: > > Hi Linus, > > This is the main drm pull request for 5.10. > > Not a major amount of change, the i915 trees got split into display > and gt trees to better facilitate higher level review, and there's a > major refactoring of i915 GEM locking to use more core kernel concepts > (like ww-mutexes). msm gets per-process pagetables, older AMD SI cards > get DC support, nouveau got a bump in displayport support with common > code extraction from i915. > > There are a bunch of conflicts but none of them seemed overly scary, > and sfr has provided resolutions for them all. I've put a tree up with > my merge results, so you can tell me I did it wrong here: > https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-next-5.10-merged Apparently I lied, and I only built my merged tree on x86 https://lore.kernel.org/dri-devel/20201015134357.0a4e61b3@xxxxxxxxxxxxxxxx/T/#t Please apply the patch from this thread once you merge my tree. Dave. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
