summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-06 22:08:35 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-20 14:23:09 +0200
commit68d3472047a572936551f8ff0b6f4016c5a1fdef (patch)
tree4d3f9b130724ba596fa17c85950ed1fcf890a2a0 /drivers/gpu/drm/i915
parent172a1ae141a20f8279dfa285d99ff0541b7eb044 (diff)
downloadblackbird-op-linux-68d3472047a572936551f8ff0b6f4016c5a1fdef.tar.gz
blackbird-op-linux-68d3472047a572936551f8ff0b6f4016c5a1fdef.zip
drm/i915: update dpms property in set_mode
Hopefully this makes userspace slightly less confused about us frobbing the dpms state behind its back. Yeah, it would be better to be more careful with not changing the dpms state, but that is quite more invasive. Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 00e8541f81ca..947c97d427cc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/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;
OpenPOWER on IntegriCloud