]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbf401ebf16f8077f5c326f37ae0f584386667b2d
treebc9ee354596925a6de8c1a7219cdf1bb975df001
parentd6f62d8ebb7c4615225d550da136645c0fcebff9
parent7517d16cc73ed1813a5d200e9a5dac0809f0800f
Merge airlied/drm-next into drm-intel-next-queued

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>
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