If we always force the pipe A to on we can't use the hw state to decide whether it should be on. Hence quirk the quirk. Note that in the hw state readout we don't really care since we have a big hack to force-enable pipe A anyway. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64764 Cc: stable@xxxxxxxxxxxxxxx Reported-and-Tested-by: mlsemon35@xxxxxxxxx Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d63bb3fa..5f2b289 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8099,6 +8099,11 @@ intel_modeset_check_state(struct drm_device *dev) pipe_config.cpu_transcoder = crtc->config.cpu_transcoder; active = dev_priv->display.get_pipe_config(crtc, &pipe_config); + + /* hw state is unreliable with the pipe A quirk */ + if (dev_priv->quirks & QUIRK_PIPEA_FORCE) + active = crtc->active; + WARN(crtc->active != active, "crtc active state doesn't match with hw state " "(expected %i, found %i)\n", crtc->active, active); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html