aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2014-06-27 19:04:01 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-07-11 12:13:36 -0400
commita62d149758d714be4bf0d70b9bd5328e7995c552 (patch)
treeab0a59b10a4d05191e622c2eb0acd236864a7f75
parente1e9fb840b684703cbc65eaef99f69194e0f161f (diff)
drm/i915: Call encoder->post_disable() in intel_sanitize_encoder()
VLV and CHV disable the DP port only in the .post_disable() hook, so we need to make intel_sanitize_encoder() call that when it's trying to disable encoders without an active pipes. My bsw actaully hits this when an external display is connected. The BIOS still likes to turn on the eDP port, but leaves the pipe disabled. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Rafael Barbalho <rafael.barbalho@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f31ad8d0f6ea..d2b752dd0aaf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12775,6 +12775,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
12775 encoder->base.base.id, 12775 encoder->base.base.id,
12776 encoder->base.name); 12776 encoder->base.name);
12777 encoder->disable(encoder); 12777 encoder->disable(encoder);
12778 if (encoder->post_disable)
12779 encoder->post_disable(encoder);
12778 } 12780 }
12779 encoder->base.crtc = NULL; 12781 encoder->base.crtc = NULL;
12780 encoder->connectors_active = false; 12782 encoder->connectors_active = false;