Merge airlied/drm-next into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 12 Apr 2017 08:07:43 +0000 (10:07 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 12 Apr 2017 08:07:43 +0000 (10:07 +0200)
Maarten needs both the new connector->atomic_check hook and the
connection_mutex locking changes in the probe helpers to be able to
start merging the connector property conversion to atomic.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1  2 
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_drv.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge