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>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 00e8541..947c97d 100644 (file)
--- 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;