From: Dave Airlie <airlied@redhat.com>
Date: Mon, 17 Aug 2015 04:13:53 +0000 (+1000)
Subject: Merge tag 'v4.2-rc7' into drm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4eebf60b7452fbd551fd7dece855ba7825a49cbc;p=linux-beck.git

Merge tag 'v4.2-rc7' into drm-next

Linux 4.2-rc7

Backmerge master for i915 fixes
---

4eebf60b7452fbd551fd7dece855ba7825a49cbc
diff --cc drivers/gpu/drm/drm_crtc.c
index 21f1f5ce2d60,fed748311b92..33d877c65ced
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5273,14 -5398,9 +5273,11 @@@ void drm_mode_config_reset(struct drm_d
  		if (encoder->funcs->reset)
  			encoder->funcs->reset(encoder);
  
 -	list_for_each_entry(connector, &dev->mode_config.connector_list, head)
 +	mutex_lock(&dev->mode_config.mutex);
- 	drm_for_each_connector(connector, dev) {
- 		connector->status = connector_status_unknown;
- 
++	drm_for_each_connector(connector, dev)
  		if (connector->funcs->reset)
  			connector->funcs->reset(connector);
- 	}
 +	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_mode_config_reset);