commit | 05adb1850aaa88d3d4cc40a531752816899cc1bf | [log] [tgz] |
---|---|---|
author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jan 10 17:03:46 2017 +0100 |
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jan 10 17:03:46 2017 +0100 |
tree | 5c6f9630a7a723012a75273fda4b06505a7152fc | |
parent | 957870f9341201b176e41eb5fa8a750b13e501aa [diff] | |
parent | 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897 [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>