Merge remote-tracking branch 'drm/drm-next'

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

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

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

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