Merge drm/drm-next into drm-intel-next

Getting in sync with -rc2

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --cc drivers/gpu/drm/i915/display/intel_atomic.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_dp_link_training.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge