Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

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

diff --cc drivers/gpu/drm/i915/intel_dp.c
index fb8a967df027390dd5138f55dac66bbb4edde320,160d5b30b3bc66497a3ca58537b7c4a10c7d1af3..bbb1327644d48b923bcf1e99a8087929095667ef
--- 1/drivers/gpu/drm/i915/intel_dp.c
--- 2/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -91,6 -91,8 +91,7 @@@ static struct intel_dp *intel_attached_
  }
  
  static void intel_dp_link_down(struct intel_dp *intel_dp);
 -static void edp_panel_vdd_on(struct intel_dp *intel_dp);
+ static bool _edp_panel_vdd_on(struct intel_dp *intel_dp);
  static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
  
  static int
@@@ -1203,6 -1080,17 +1079,17 @@@ static bool _edp_panel_vdd_on(struct in
                DRM_DEBUG_KMS("eDP was not running\n");
                msleep(intel_dp->panel_power_up_delay);
        }
 -static void edp_panel_vdd_on(struct intel_dp *intel_dp)
+ 
+       return need_to_disable;
+ }
+ 
++void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)
+ {
+       if (is_edp(intel_dp)) {
+               bool vdd = _edp_panel_vdd_on(intel_dp);
+ 
+               WARN(!vdd, "eDP VDD already requested on\n");
+       }
  }
  
  static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
@@@ -2953,9 -2830,9 +2835,9 @@@ intel_dp_probe_oui(struct intel_dp *int
        if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
                return;
  
 -      edp_panel_vdd_on(intel_dp);
 +      intel_edp_panel_vdd_on(intel_dp);
  
-       if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3))
+       if (intel_dp_dpcd_read_wake(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3)
                DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
                              buf[0], buf[1], buf[2]);
  

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