UBUNTU: SAUCE: drm/i915: Workaround for DP DPMS D3 on Dell monitor

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / i915 / intel_dp.c

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 61c313e21a910150a96696a8ace8e233f00a02a9..9794431c61a51c97a29f7685edae0aac773a0159 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2660,7 +2660,8 @@ static void intel_disable_dp(struct intel_encoder *encoder,
         * ensure that we have vdd while we switch off the panel. */
        intel_edp_panel_vdd_on(intel_dp);
        intel_edp_backlight_off(old_conn_state);
-       intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
+       if (!(dev_priv->quirks & QUIRK_SKIP_DP_DPMS_D3))
+               intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
        intel_edp_panel_off(intel_dp);
 
        /* disable the port before the pipe on g4x */