[PATCH] drm/i915/display: WA_14011503117

[Nemesa Garg]

Signed-off-by: Nemesa Garg <nemesa.garg at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c |  6 ++++++
 drivers/gpu/drm/i915/display/skl_scaler.c    | 15 +++++++++++++++
 drivers/gpu/drm/i915/display/skl_scaler.h    |  1 +
 3 files changed, 22 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 456fc4b04cda..72e561ceb58a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1706,6 +1706,9 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
 		else
 			ilk_pfit_enable(pipe_crtc_state);
 
+		/* WA_14011503117: adlp_p */
+		skl_scaler_ecc_unmask(pipe_crtc_state);
+
 		/*
 		 * On ILK+ LUT must be loaded before the pipe is running but with
 		 * clocks enabled
@@ -6590,6 +6593,9 @@ static void intel_pipe_fastset(const struct intel_crtc_state *old_crtc_state,
 			ilk_pfit_disable(old_crtc_state);
 	}
 
+	/* WA_14011503117: adlp_p */
+	skl_scaler_ecc_unmask(new_crtc_state);
+
 	/*
 	 * The register is supposedly single buffered so perhaps
 	 * not 100% correct to do this here. But SKL+ calculate
diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
index d77798499c57..e8552135041f 100644
--- a/drivers/gpu/drm/i915/display/skl_scaler.c
+++ b/drivers/gpu/drm/i915/display/skl_scaler.c
@@ -923,3 +923,18 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state)
 	else
 		scaler_state->scaler_users &= ~(1 << SKL_CRTC_INDEX);
 }
+
+void skl_scaler_ecc_unmask(const struct intel_crtc_state *crtc_state)
+{
+	struct intel_display *display = to_intel_display(crtc_state);
+	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+	const struct intel_crtc_scaler_state *scaler_state =
+		&crtc_state->scaler_state;
+	int id = scaler_state->scaler_id;
+
+	if (DISPLAY_VER(display) != 13)
+		return;
+
+	intel_de_write(display, SKL_PS_ECC_STAT(crtc->pipe, id), 1);
+	intel_de_write(display, XELPD_DISPLAY_ERR_FATAL_MASK, 0);
+}
diff --git a/drivers/gpu/drm/i915/display/skl_scaler.h b/drivers/gpu/drm/i915/display/skl_scaler.h
index 355ea15260ca..2425c7d7f473 100644
--- a/drivers/gpu/drm/i915/display/skl_scaler.h
+++ b/drivers/gpu/drm/i915/display/skl_scaler.h
@@ -32,4 +32,5 @@ void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state);
 
 void skl_scaler_get_config(struct intel_crtc_state *crtc_state);
 
+void skl_scaler_ecc_unmask(const struct intel_crtc_state *crtc_state);
 #endif
-- 
2.25.1