diff options
| author | Ville Syrjälä | 2014-06-28 01:04:01 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-07-11 18:13:36 +0200 |
| commit | a62d149758d714be4bf0d70b9bd5328e7995c552 (patch) | |
| tree | ab0a59b10a4d05191e622c2eb0acd236864a7f75 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: ddi: enable runtime pm during dpms (diff) | |
| download | kernel-qcow2-linux-a62d149758d714be4bf0d70b9bd5328e7995c552.tar.gz kernel-qcow2-linux-a62d149758d714be4bf0d70b9bd5328e7995c552.tar.xz kernel-qcow2-linux-a62d149758d714be4bf0d70b9bd5328e7995c552.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
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) encoder->base.base.id, encoder->base.name); encoder->disable(encoder); + if (encoder->post_disable) + encoder->post_disable(encoder); } encoder->base.crtc = NULL; encoder->connectors_active = false; |