drm/i915: don't call dpms funcs after set_mode

... because our current set_mode implementation doesn't bother to adjust
for the dpms state, we just forcefully update it. So stop pretending that
we're better than we are and rip out this extranous call.

Note that this totally confuses userspace, because the exposed connector
property isn't actually updated ...

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 5e42a03f268501dc8f2b0cd6c53d069b61a9f0cf..00e8541f81ca60dd70a0dba512861509e3de216e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7296,7 +7296,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
        struct drm_mode_set save_set;
        struct intel_set_config *config;
        int ret;
-       int i;
 
        BUG_ON(!set);
        BUG_ON(!set->crtc);
@@ -7360,15 +7359,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
                        ret = -EINVAL;
                        goto fail;
                }
-
-               if (set->crtc->enabled) {
-                       DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
-                       for (i = 0; i < set->num_connectors; i++) {
-                               DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
-                                             drm_get_connector_name(set->connectors[i]));
-                               set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
-                       }
-               }
        } else if (config->fb_changed) {
                ret = intel_pipe_set_base(set->crtc,
                                          set->x, set->y, set->fb);