From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jun 2012 01:01:18 +0000 (-0700)
Subject: Merge branch 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux

Pull drm prime mmap/vmap code from Dave Airlie:
 "As mentioned previously these are the extra bits of drm that relied on
  the dma-buf pull to work, the first three just stub out the mmap
  interface, and the next set provide vmap export to i915/radeon/nouveau
  and vmap import to udl."

* 'drm-prime-vmap' of git://people.freedesktop.org/~airlied/linux:
  radeon: add radeon prime vmap support.
  nouveau: add vmap support to nouveau prime support
  udl: support vmapping imported dma-bufs
  i915: add dma-buf vmap support for exporting vmapped buffer
  radeon: add stub dma-buf mmap functionality
  nouveau: add stub dma-buf mmap functionality.
  i915: add stub dma-buf mmap callback.
---

9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702