[PATCH 5/9] aaa

[José Roberto de Souza]

---
 drivers/gpu/drm/i915/intel_display.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5930838a2b6b..6790f5c1d895 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11238,14 +11238,14 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
 			return ret;
 	}
 
-	if (mode_changed || crtc_state->color_mgmt_changed) {
+	/*if (mode_changed || crtc_state->color_mgmt_changed) {
 		ret = intel_color_check(pipe_config);
 		if (ret)
 			return ret;
 	} else {
 		DRM_DEBUG_KMS("not running intel_color_check() | mode_changed=%i color_mgmt_changed=%i gamma_enable=%i csc_enable=%i\n", mode_changed, crtc_state->color_mgmt_changed, pipe_config->gamma_enable, pipe_config->csc_enable);
 		dump_stack();
-	}
+	}*/
 
 	ret = 0;
 	if (dev_priv->display.compute_pipe_wm) {
@@ -11699,7 +11699,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
 
 	/* Keep base drm_crtc_state intact, only clear our extended struct */
 	BUILD_BUG_ON(offsetof(struct intel_crtc_state, base));
-	DRM_DEBUG_KMS("clear_intel_crtc_state() &crtc_state->base + 1=%p &crtc_state->quirks=%p\n", &crtc_state->base + 1, &crtc_state->quirks);
+	DRM_DEBUG_KMS("***** clear_intel_crtc_state() &crtc_state->base + 1=%p &crtc_state->quirks=%p\n", &crtc_state->base + 1, &crtc_state->quirks);
 	memcpy(&crtc_state->base + 1, &saved_state->base + 1,
 	       sizeof(*crtc_state) - sizeof(crtc_state->base));
 
@@ -11785,6 +11785,10 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
 			pipe_config->output_types |= BIT(encoder->type);
 	}
 
+	ret = intel_color_check(pipe_config);
+	if (ret)
+		return ret;
+
 encoder_retry:
 	/* Ensure the port clock defaults are reset when retrying. */
 	pipe_config->port_clock = 0;
-- 
2.21.0