]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1724895 da9a2d5)
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)
commitde40c4677e93780f744469f73101a0665b44c644
tree5c6f9630a7a723012a75273fda4b06505a7152fctree | snapshot
parent17248959d4ced7eb5ed1a6287dee98d494ac1f05commit | diff
parentda9a2d5f028407f67f0217edad5072357f81b2c2commit | 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
Linux Kernel Source Tree.