drm/i915: Disable double wide even when leaving the pipe on
Disable double wide even if the pipe quirk compels us to leave the pipe running. Double wide has certain implications for the plane assignments so best keep it off. Also helps resuming from S3 on the Fujitsu-Siemens Lifebook S6010 when double wide was enabled prior to suspend. We do leave the pixel clock ticking at the original rate which would require double wide to be enabled. But since the planes are all disabled I'm hoping that the overly fast clock won't cause any problems. Seems to be fine so far. v2: Disable double wide also when turning the pipe off v3: Reorder wrt. force pipe B quirk Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: Thomas Richter <richter@rus.uni-stuttgart.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
575f7ab754
commit
67adc6442a
|
@ -2066,17 +2066,25 @@ static void intel_disable_pipe(struct intel_crtc *crtc)
|
|||
assert_cursor_disabled(dev_priv, pipe);
|
||||
assert_sprites_disabled(dev_priv, pipe);
|
||||
|
||||
/* Don't disable pipe A or pipe A PLLs if needed */
|
||||
if (pipe == PIPE_A && (dev_priv->quirks & QUIRK_PIPEA_FORCE))
|
||||
return;
|
||||
|
||||
reg = PIPECONF(cpu_transcoder);
|
||||
val = I915_READ(reg);
|
||||
if ((val & PIPECONF_ENABLE) == 0)
|
||||
return;
|
||||
|
||||
I915_WRITE(reg, val & ~PIPECONF_ENABLE);
|
||||
intel_wait_for_pipe_off(crtc);
|
||||
/*
|
||||
* Double wide has implications for planes
|
||||
* so best keep it disabled when not needed.
|
||||
*/
|
||||
if (crtc->config.double_wide)
|
||||
val &= ~PIPECONF_DOUBLE_WIDE;
|
||||
|
||||
/* Don't disable pipe or pipe PLLs if needed */
|
||||
if (!(pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE))
|
||||
val &= ~PIPECONF_ENABLE;
|
||||
|
||||
I915_WRITE(reg, val);
|
||||
if ((val & PIPECONF_ENABLE) == 0)
|
||||
intel_wait_for_pipe_off(crtc);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue