---

yaml --- r: 329493 b: refs/heads/master c: 68d3472 h: refs/heads/master i: 329491: ef5c97f v: v3
git-mirror · Sep 20, 2012 · 607b2fa · 607b2fa
1 parent 8f35a02
commit 607b2fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 172a1ae141a20f8279dfa285d99ff0541b7eb044
+refs/heads/master: 68d3472047a572936551f8ff0b6f4016c5a1fdef
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6866,7 +6866,13 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)
 		intel_crtc = to_intel_crtc(connector->encoder->crtc);
 
 		if (prepare_pipes & (1 << intel_crtc->pipe)) {
+			struct drm_property *dpms_property =
+				dev->mode_config.dpms_property;
+
 			connector->dpms = DRM_MODE_DPMS_ON;
+			drm_connector_property_set_value(connector,
+							 dpms_property,
+							 DRM_MODE_DPMS_ON);
 
 			intel_encoder = to_intel_encoder(connector->encoder);
 			intel_encoder->connectors_active = true;