diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ad1117bebd7..56746dcac40 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7937,6 +7937,11 @@ intel_modeset_check_state(struct drm_device *dev)  		memset(&pipe_config, 0, sizeof(pipe_config));  		active = dev_priv->display.get_pipe_config(crtc,  							   &pipe_config); + +		/* hw state is inconsistent with the pipe A quirk */ +		if (crtc->pipe == PIPE_A && 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);  |