Merge drm/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 23 Jul 2018 16:13:12 +0000 (09:13 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 23 Jul 2018 16:13:12 +0000 (09:13 -0700)
We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1  2 
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_dpll_mgr.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge