From: Maarten Lankhorst Date: Wed, 17 Feb 2016 08:18:38 +0000 (+0100) Subject: drm/i915: Use correct dpms for intel_enable_crt. X-Git-Tag: Ubuntu-5.0.0-8.9~7573^2~20^2~27 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7bb4afb45879541257d479aba3851135f6a7445c;p=mirror_ubuntu-disco-kernel.git drm/i915: Use correct dpms for intel_enable_crt. With the conversion to atomic only on/off are still supported. The rest is mapped to one of those, and when enable is called DPMS_ON should be true. Signed-off-by: Maarten Lankhorst Reviewed-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1455697119-31416-5-git-send-email-maarten.lankhorst@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 84c3efddf7d4..505fc5cf26f8 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -213,9 +213,7 @@ static void pch_post_disable_crt(struct intel_encoder *encoder) static void intel_enable_crt(struct intel_encoder *encoder) { - struct intel_crt *crt = intel_encoder_to_crt(encoder); - - intel_crt_set_dpms(encoder, crt->connector->base.dpms); + intel_crt_set_dpms(encoder, DRM_MODE_DPMS_ON); } static enum drm_mode_status