Merge remote branch 'linus' into drm-intel-fixes

diff --combined drivers/gpu/drm/i915/intel_crt.c
index 8f6f38c7d84d5c008394be4ce5b40cda154d0170,a02a8df7372778bc41735c93240702daec8d21cc..197d4f32585a59b5b336328b470fa038bc922781
--- 1/drivers/gpu/drm/i915/intel_crt.c
--- 2/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@@ -188,7 -188,7 +188,7 @@@ static bool intel_ironlake_crt_detect_h
  
        if (wait_for((I915_READ(PCH_ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
                     1000, 1))
 -              DRM_ERROR("timed out waiting for FORCE_TRIGGER");
 +              DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
  
        if (turn_off_dac) {
                I915_WRITE(PCH_ADPA, temp);
@@@ -245,7 -245,7 +245,7 @@@ static bool intel_crt_detect_hotplug(st
                if (wait_for((I915_READ(PORT_HOTPLUG_EN) &
                              CRT_HOTPLUG_FORCE_DETECT) == 0,
                             1000, 1))
 -                      DRM_ERROR("timed out waiting for FORCE_DETECT to go off");
 +                      DRM_DEBUG_KMS("timed out waiting for FORCE_DETECT to go off");
        }
  
        stat = I915_READ(PORT_HOTPLUG_STAT);
@@@ -400,7 -400,8 +400,8 @@@ intel_crt_load_detect(struct drm_crtc *
        return status;
  }
  
- static enum drm_connector_status intel_crt_detect(struct drm_connector *connector)
+ static enum drm_connector_status
+ intel_crt_detect(struct drm_connector *connector, bool force)
  {
        struct drm_device *dev = connector->dev;
        struct drm_encoder *encoder = intel_attached_encoder(connector);
@@@ -419,6 -420,9 +420,9 @@@
        if (intel_crt_detect_ddc(encoder))
                return connector_status_connected;
  
+       if (!force)
+               return connector->status;
+ 
        /* for pre-945g platforms use load detect */
        if (encoder->crtc && encoder->crtc->enabled) {
                status = intel_crt_load_detect(encoder->crtc, intel_encoder);