projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 957870f 282d0a3)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 10 Jan 2017 16:03:46 +0000 (17:03 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 10 Jan 2017 16:03:46 +0000 (17:03 +0100)
commit05adb1850aaa88d3d4cc40a531752816899cc1bf
tree5c6f9630a7a723012a75273fda4b06505a7152fctree | snapshot
parent957870f9341201b176e41eb5fa8a750b13e501aacommit | diff
parent282d0a35c8c42c3ac4dd86a7e408ed1b30db4897commit | diff
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Pull in latest drm-next from Dave Airlie to get at all the drm-misc
goodies, specifically:
- dma_fence error state handling rework (Chris needs that for error
  recovery)
- crc support locking changes (Tomeu's i915 crc patches need that).

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
John Crispins staging tree