Merge tag 'drm-for-v4.13' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000 (21:56 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000 (21:56 +0200)
commit953152253e9cbd4f358d4b4ca56d48072af3846d
tree6c60e924732351682959f911833e3434d78aa849
parent6d6a89708188823d676c9b84e7e2534b822465e3
parent00fc2c26bc46a64545cdf95a1511461ea9acecb4
Merge tag 'drm-for-v4.13' into drm-intel-next-queued

Resync with the main drm-next pull request for 4.13. What we really
need is to fully resync with pending drm-misc, but that's not yet
possible due to the still ongoing merge window.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h