]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73c0fca b8a89f5)
Merge drm-next into drm-intel-next-queued
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 28 Feb 2018 10:12:03 +0000 (12:12 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 28 Feb 2018 10:12:03 +0000 (12:12 +0200)
To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1  2 
drivers/gpu/drm/i915/gvt/dmabuf.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/i915/gvt/dmabuf.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.