[PATCH 1/5] drm/i915: Remove CNL from WA 827

[PATCH 1/5] drm/i915: Remove CNL from WA 827

[Rodrigo Vivi]

CNL A stepping was the only affected there.
But also it is time to clean old pre-production
CNL Workarounds, so let's just remove and clean
this W/A.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c3cadc09f859..dd88ffe9e273 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5242,8 +5242,8 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
 	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
 		return false;
 
-	if ((IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv)) ||
-	    IS_CANNONLAKE(dev_priv))
+	/* WA Display #0827: Gen9:all */
+	if (IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv))
 		return true;
 
 	return false;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/5] drm/i915/cnl: Remove useless CNL A-stepping workarounds.

[Rodrigo Vivi]

These were always useless since CNL A stepping needed many
more workarounds that were never introduced and also
we started Linux work on CNL B stepping anyways.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c    | 10 ++--------
 drivers/gpu/drm/i915/intel_wopcm.c |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82c82e233154..9ee96016cfd5 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4824,12 +4824,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 	}
 
 	/*
-	 * Display WA #826 (SKL:ALL, BXT:ALL) & #1059 (CNL:A)
+	 * Display WA #826 (SKL:ALL, BXT:ALL)
 	 * disable wm level 1-7 on NV12 planes
 	 */
 	if (wp->is_planar && level >= 1 &&
-	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv) ||
-	     IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))) {
+	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
 		result->plane_en = false;
 		return 0;
 	}
@@ -4953,11 +4952,6 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
 				trans_offset_b;
 	} else {
 		res_blocks = wm0_sel_res_b + trans_offset_b;
-
-		/* WA BUG:1938466 add one block for non y-tile planes */
-		if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))
-			res_blocks += 1;
-
 	}
 
 	res_blocks += 1;
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 92cb82dd0c07..b8ee8669c260 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -133,8 +133,7 @@ static inline int check_hw_restriction(struct drm_i915_private *i915,
 	if (IS_GEN9(i915))
 		err = gen9_check_dword_gap(guc_wopcm_base, guc_wopcm_size);
 
-	if (!err &&
-	    (IS_GEN9(i915) || IS_CNL_REVID(i915, CNL_REVID_A0, CNL_REVID_A0)))
+	if (!err && IS_GEN9(i915))
 		err = gen9_check_huc_fw_fits(guc_wopcm_size, huc_fw_size);
 
 	return err;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/5] drm/i915: Introduce HAS_NV12 and define WA 0870.

[Rodrigo Vivi]

Let's introduce HAS_NV12 to check for feature itself
than spread the platform checks everywhere.

Also let's introduce the WA number that is the
cause of having NV12 disabled on both SLK and BXT.

According to Spec:

WA 0870: "Display flickers with NV12 video playback in
Y tiling mode.
WA: Use YUV422 surface format instead of NV12."

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h          | 1 +
 drivers/gpu/drm/i915/i915_pci.c          | 5 +++++
 drivers/gpu/drm/i915/intel_device_info.h | 1 +
 drivers/gpu/drm/i915/intel_display.c     | 7 +++----
 drivers/gpu/drm/i915/intel_sprite.c      | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c9e5bab6861b..57ea094054d5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2630,6 +2630,7 @@ intel_info(const struct drm_i915_private *dev_priv)
 #define HAS_RC6pp(dev_priv)		 (false) /* HW was never validated */
 
 #define HAS_CSR(dev_priv)	((dev_priv)->info.has_csr)
+#define HAS_NV12(dev_priv)	((dev_priv)->info.has_nv12)
 
 #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
 #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 44e745921ac1..eb797c1ef842 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -462,6 +462,7 @@ static const struct intel_device_info intel_cherryview_info = {
 	GEN(9), \
 	GEN9_DEFAULT_PAGE_SIZES, \
 	.has_logical_ring_preemption = 1, \
+	.has_nv12 = 1, \
 	.has_csr = 1, \
 	.has_guc = 1, \
 	.has_ipc = 1, \
@@ -471,6 +472,8 @@ static const struct intel_device_info intel_cherryview_info = {
 	GEN9_FEATURES, \
 	/* Display WA #0477 WaDisableIPC: skl */ \
 	.has_ipc = 0, \
+	/* Display WA #0870: skl */ \
+	.has_nv12 = 0, \
 	PLATFORM(INTEL_SKYLAKE)
 
 static const struct intel_device_info intel_skylake_gt1_info = {
@@ -531,6 +534,8 @@ static const struct intel_device_info intel_broxton_info = {
 	GEN9_LP_FEATURES,
 	PLATFORM(INTEL_BROXTON),
 	.ddb_size = 512,
+	/* Display WA #0870: bxt */
+	.has_nv12 = 0,
 };
 
 static const struct intel_device_info intel_geminilake_info = {
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index b4c2c4eae78b..ba9e9c59dc6c 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -104,6 +104,7 @@ enum intel_ppgtt {
 	func(has_logical_ring_contexts); \
 	func(has_logical_ring_elsq); \
 	func(has_logical_ring_preemption); \
+	func(has_nv12); \
 	func(has_overlay); \
 	func(has_pooled_eu); \
 	func(has_psr); \
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index dd88ffe9e273..14f6f66b00d2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -470,7 +470,7 @@ skl_wa_528(struct drm_i915_private *dev_priv, int pipe, bool enable)
 static void
 skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
 {
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
+	if (!HAS_NV12(dev_priv))
 		return;
 
 	if (enable)
@@ -5239,7 +5239,7 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
 	if (!crtc_state->nv12_planes)
 		return false;
 
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
+	if (!HAS_NV12(dev_priv))
 		return false;
 
 	/* WA Display #0827: Gen9:all */
@@ -14519,8 +14519,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 		}
 		break;
 	case DRM_FORMAT_NV12:
-		if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
-		    IS_BROXTON(dev_priv)) {
+		if (!HAS_NV12(dev_priv)) {
 			DRM_DEBUG_KMS("unsupported pixel format: %s\n",
 				      drm_get_format_name(mode_cmd->pixel_format,
 							  &format_name));
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index e7c95ec879cc..582a2972c90d 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1868,7 +1868,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
 	if (INTEL_GEN(dev_priv) >= 11)
 		return plane_id <= PLANE_SPRITE3;
 
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
+	if (!HAS_NV12(dev_priv))
 		return false;
 
 	if (IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C)
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 4/5] drm/i915: Kill WA 0528

[Rodrigo Vivi]

First of all I believe this WA as written here was wrong.

Because it is listed on BSpec only for SKL and BXT, exactly
the only 2 platforms skipped here.

But also it is written there that we don't need this WA
anymore:
"This workaround is no longer needed since NV12 support is
dropped for the affected projects in #0870."

SO, let's kill it.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 14f6f66b00d2..aacc340d4eec 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -455,18 +455,6 @@ static const struct intel_limit intel_limits_bxt = {
 	.p2 = { .p2_slow = 1, .p2_fast = 20 },
 };
 
-static void
-skl_wa_528(struct drm_i915_private *dev_priv, int pipe, bool enable)
-{
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
-		return;
-
-	if (enable)
-		I915_WRITE(CHICKEN_PIPESL_1(pipe), HSW_FBCQ_DIS);
-	else
-		I915_WRITE(CHICKEN_PIPESL_1(pipe), 0);
-}
-
 static void
 skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
 {
@@ -5286,7 +5274,6 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
 	if (needs_nv12_wa(dev_priv, old_crtc_state) &&
 	    !needs_nv12_wa(dev_priv, pipe_config)) {
 		skl_wa_clkgate(dev_priv, crtc->pipe, false);
-		skl_wa_528(dev_priv, crtc->pipe, false);
 	}
 }
 
@@ -5326,7 +5313,6 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
 	if (!needs_nv12_wa(dev_priv, old_crtc_state) &&
 	    needs_nv12_wa(dev_priv, pipe_config)) {
 		skl_wa_clkgate(dev_priv, crtc->pipe, true);
-		skl_wa_528(dev_priv, crtc->pipe, true);
 	}
 
 	/*
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 5/5] drm/i915: Kill WA 0826

[Rodrigo Vivi]

According to BSpec this is not needed anymore:

"This workaround is no longer needed since NV12
support is dropped for the affected projects.
"

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9ee96016cfd5..f202b9b3b796 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4823,16 +4823,6 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 		}
 	}
 
-	/*
-	 * Display WA #826 (SKL:ALL, BXT:ALL)
-	 * disable wm level 1-7 on NV12 planes
-	 */
-	if (wp->is_planar && level >= 1 &&
-	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
-		result->plane_en = false;
-		return 0;
-	}
-
 	/* The number of lines are ignored for the level 0 watermark. */
 	result->plane_res_b = res_blocks;
 	result->plane_res_l = res_lines;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/5] drm/i915: Remove CNL from WA 827

[Clint Taylor]

On 10/29/2018 04:00 PM, Rodrigo Vivi wrote:
> CNL A stepping was the only affected there.
> But also it is time to clean old pre-production
> CNL Workarounds, so let's just remove and clean
> this W/A.
>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_display.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c3cadc09f859..dd88ffe9e273 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5242,8 +5242,8 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
>   	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
>   		return false;
>   
> -	if ((IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv)) ||
> -	    IS_CANNONLAKE(dev_priv))
> +	/* WA Display #0827: Gen9:all */
> +	if (IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv))
>   		return true;
>   
>   	return false;

Looks good.
Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915/cnl: Remove useless CNL A-stepping workarounds.

[Rodrigo Vivi]

These were always useless since CNL A stepping needed many
more workarounds that were never introduced and also
we started Linux work on CNL B stepping anyways.

v2: Clinton noticed this isolated patch outside of series
    wasn't compiling due to missing brackets.

Cc: Clinton Taylor <clinton.a.taylor@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c    | 10 ++--------
 drivers/gpu/drm/i915/intel_wopcm.c |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82c82e233154..e1b712a43162 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4824,12 +4824,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 	}
 
 	/*
-	 * Display WA #826 (SKL:ALL, BXT:ALL) & #1059 (CNL:A)
+	 * Display WA #826 (SKL:ALL, BXT:ALL)
 	 * disable wm level 1-7 on NV12 planes
 	 */
 	if (wp->is_planar && level >= 1 &&
-	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv) ||
-	     IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))) {
+	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) {
 		result->plane_en = false;
 		return 0;
 	}
@@ -4953,11 +4952,6 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
 				trans_offset_b;
 	} else {
 		res_blocks = wm0_sel_res_b + trans_offset_b;
-
-		/* WA BUG:1938466 add one block for non y-tile planes */
-		if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))
-			res_blocks += 1;
-
 	}
 
 	res_blocks += 1;
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 92cb82dd0c07..b8ee8669c260 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -133,8 +133,7 @@ static inline int check_hw_restriction(struct drm_i915_private *i915,
 	if (IS_GEN9(i915))
 		err = gen9_check_dword_gap(guc_wopcm_base, guc_wopcm_size);
 
-	if (!err &&
-	    (IS_GEN9(i915) || IS_CNL_REVID(i915, CNL_REVID_A0, CNL_REVID_A0)))
+	if (!err && IS_GEN9(i915))
 		err = gen9_check_huc_fw_fits(guc_wopcm_size, huc_fw_size);
 
 	return err;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.SPARSE: warning for series starting with [1/5] drm/i915: Remove CNL from WA 827

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827
URL   : https://patchwork.freedesktop.org/series/51713/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: Remove CNL from WA 827
Okay!

Commit: drm/i915/cnl: Remove useless CNL A-stepping workarounds.
-drivers/gpu/drm/i915/i915_drv.h:172:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:172:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:172:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:172:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/i915_drv.h:181:19: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1145:22: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1145:22: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1153:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1179:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1431:25: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1431:25: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1438:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1438:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1440:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1440:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1442:32: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1442:32: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1445:36: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1445:36: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1447:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1447:37: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1449:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1449:34: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1636:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1711:31: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1711:31: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:1914:45: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2055:36: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2055:36: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2064:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2064:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2068:49: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2068:49: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2070:50: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2070:50: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2106:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2106:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2511:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2511:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2535:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2535:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2658:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2658:16: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2728:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2728:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2729:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2729:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2730:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2730:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2983:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2983:17: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2985:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:2985:29: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3174:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3174:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3175:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3175:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3176:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3176:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3177:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3177:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3225:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3225:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3226:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3226:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3227:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3227:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3228:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:3228:35: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:4951:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:4951:30: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:6694:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:6694:24: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_pm.c:6698:35: warning: too many warnings
-drivers/gpu/drm/i915/intel_pm.c:927:16: warning: expression using sizeof(void)
+ ^
+  ^
+  ^
+  ^~~~~~
+   ^~~~~~
+        ^~
+        ^~
+        ^~
+  }
+  }
+ }
+cc1: all warnings being treated as errors
+drivers/gpu/drm/i915/intel_pm.c:4832:17: error: Expected ) after if
+drivers/gpu/drm/i915/intel_pm.c:4832:17: error: got result
+drivers/gpu/drm/i915/intel_pm.c:4832:3: error: expected ‘)’ before ‘result’
+drivers/gpu/drm/i915/intel_pm.c:4834:2: error: control reaches end of non-void function [-Werror=return-type]
+drivers/gpu/drm/i915/intel_pm.c:4834:2: error: expected expression before ‘}’ token
+drivers/gpu/drm/i915/intel_pm.c:4837:15: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4837:15: error: got ->
+drivers/gpu/drm/i915/intel_pm.c:4837:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
+drivers/gpu/drm/i915/intel_pm.c:4838:15: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4838:15: error: got ->
+drivers/gpu/drm/i915/intel_pm.c:4838:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
+drivers/gpu/drm/i915/intel_pm.c:4839:15: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4839:15: error: got ->
+drivers/gpu/drm/i915/intel_pm.c:4839:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
+drivers/gpu/drm/i915/intel_pm.c:4841:16: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4841:16: error: got 0
+drivers/gpu/drm/i915/intel_pm.c:4841:2: error: expected identifier or ‘(’ before ‘return’
+drivers/gpu/drm/i915/intel_pm.c:4841:9: error: Trying to use reserved word 'return' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4842:1: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4842:1: error: expected identifier or ‘(’ before ‘}’ token
+drivers/gpu/drm/i915/intel_pm.c:4842:1: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Expected ) in nested declarator
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got !
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got {
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got {
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Trying to use reserved word 'do' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4858:13: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4858:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4861:20: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4861:20: error: got =
+drivers/gpu/drm/i915/intel_pm.c:4861:31: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4861:31: error: got <=
+drivers/gpu/drm/i915/intel_pm.c:4861:50: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4861:50: error: got ++
+drivers/gpu/drm/i915/intel_pm.c:4861:9: error: Trying to use reserved word 'for' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4872:17: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4873:25: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4873:25: error: got return
+drivers/gpu/drm/i915/intel_pm.c:4876:9: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4876:9: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4881:16: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4881:16: error: got 0
+drivers/gpu/drm/i915/intel_pm.c:4881:9: error: Trying to use reserved word 'return' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4882:1: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4882:1: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4894:28: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4894:28: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4894:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4900:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4900:13: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4900:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4904:16: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4904:16: error: got linetime_wm
+drivers/gpu/drm/i915/intel_pm.c:4904:9: error: Trying to use reserved word 'return' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4905:1: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4905:1: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4919:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4919:13: error: got !
+drivers/gpu/drm/i915/intel_pm.c:4919:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4923:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4923:13: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4923:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4927:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4927:13: error: got !
+drivers/gpu/drm/i915/intel_pm.c:4927:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4931:13: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4931:13: error: got (
+drivers/gpu/drm/i915/intel_pm.c:4931:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4948:15: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4948:15: error: got ->
+drivers/gpu/drm/i915/intel_pm.c:4948:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4953:9: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4953:9: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4955:9: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4955:9: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4959:24: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4959:24: error: got <
+drivers/gpu/drm/i915/intel_pm.c:4959:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4961:25: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4961:25: error: got ->
+drivers/gpu/drm/i915/intel_pm.c:4962:17: error: Trying to use reserved word 'return' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4963:9: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4963:9: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4967:1: error: Expected ; at the end of type declaration
+drivers/gpu/drm/i915/intel_pm.c:4967:1: error: got }
+drivers/gpu/drm/i915/intel_pm.c:4985:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4986:17: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4986:17: error: got return
+drivers/gpu/drm/i915/intel_pm.c:4991:9: error: Trying to use reserved word 'if' as identifier
+drivers/gpu/drm/i915/intel_pm.c:4992:17: error: Expected ; at end of declaration
+drivers/gpu/drm/i915/intel_pm.c:4992:17: error: got return
+drivers/gpu/drm/i915/intel_pm.c:4994:41: error: Expected ) in function declarator
+drivers/gpu/drm/i915/intel_pm.c:4994:41: error: got ,
+drivers/gpu/drm/i915/intel_pm.c:4997:9: error: too many errors
+drivers/gpu/drm/i915/intel_pm.c: At top level:
+drivers/gpu/drm/i915/intel_pm.c: In function ‘skl_compute_plane_wm’:
+drivers/gpu/drm/i915/intel_pm.c: In function ‘skl_compute_plane_wm’:
+make[1]: *** [drivers/gpu/drm/i915] Error 2
+make[2]: *** [drivers/gpu/drm/i915/intel_pm.o] Error 1
+make[2]: *** Waiting for unfinished jobs....
+make: *** [drivers/gpu/drm/] Error 2
+   result->plane_en = false;
+  result->plane_en = true;
+  result->plane_res_b = res_blocks;
+  result->plane_res_l = res_lines;
+  return 0;

Commit: drm/i915: Introduce HAS_NV12 and define WA 0870.
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3699:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3700:16: warning: expression using sizeof(void)

Commit: drm/i915: Kill WA 0528
Okay!

Commit: drm/i915: Kill WA 0826
- ^
-  ^
-  ^
-  ^~~~~~
-   ^~~~~~
-        ^~
-        ^~
-        ^~
-  }
-  }
- }
-cc1: all warnings being treated as errors
-O:drivers/gpu/drm/i915/intel_pm.c:4832:17: error: Expected ) after if
-O:drivers/gpu/drm/i915/intel_pm.c:4832:17: error: got result
-O:drivers/gpu/drm/i915/intel_pm.c:4832:3: error: expected ‘)’ before ‘result’
-O:drivers/gpu/drm/i915/intel_pm.c:4834:2: error: control reaches end of non-void function [-Werror=return-type]
-O:drivers/gpu/drm/i915/intel_pm.c:4834:2: error: expected expression before ‘}’ token
-O:drivers/gpu/drm/i915/intel_pm.c:4837:15: error: Expected ; at end of declaration
-O:drivers/gpu/drm/i915/intel_pm.c:4837:15: error: got ->
-O:drivers/gpu/drm/i915/intel_pm.c:4837:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
-O:drivers/gpu/drm/i915/intel_pm.c:4838:15: error: Expected ; at end of declaration
-O:drivers/gpu/drm/i915/intel_pm.c:4838:15: error: got ->
-O:drivers/gpu/drm/i915/intel_pm.c:4838:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
-drivers/gpu/drm/i915/intel_pm.c:4829:15: error: Expected ; at end of declaration
-drivers/gpu/drm/i915/intel_pm.c:4829:15: error: got ->
-drivers/gpu/drm/i915/intel_pm.c:4829:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token
-drivers/gpu/drm/i915/intel_pm.c:4831:16: error: Expected ; at end of declaration
-drivers/gpu/drm/i915/intel_pm.c:4831:16: error: got 0
-drivers/gpu/drm/i915/intel_pm.c:4831:2: error: expected identifier or ‘(’ before ‘return’
-drivers/gpu/drm/i915/intel_pm.c:4831:9: error: Trying to use reserved word 'return' as identifier
-drivers/gpu/drm/i915/intel_pm.c:4832:1: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_pm.c:4832:1: error: expected identifier or ‘(’ before ‘}’ token
-drivers/gpu/drm/i915/intel_pm.c:4832:1: error: got }
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at end of declaration
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_pm.c:4848:13: error: Expected ; at the end of type declaration
-drivers/gpu/drm/i915/intel_p

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915: Kill WA 0826

[Rodrigo Vivi]

According to BSpec this is not needed anymore:

"This workaround is no longer needed since NV12
support is dropped for the affected projects.
"

v2: Rebase

Cc: Clinton Taylor <clinton.a.taylor@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e1b712a43162..f202b9b3b796 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4823,16 +4823,6 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 		}
 	}
 
-	/*
-	 * Display WA #826 (SKL:ALL, BXT:ALL)
-	 * disable wm level 1-7 on NV12 planes
-	 */
-	if (wp->is_planar && level >= 1 &&
-	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) {
-		result->plane_en = false;
-		return 0;
-	}
-
 	/* The number of lines are ignored for the level 0 watermark. */
 	result->plane_res_b = res_blocks;
 	result->plane_res_l = res_lines;
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: Remove CNL from WA 827

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827
URL   : https://patchwork.freedesktop.org/series/51713/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_5052 -> Patchwork_10639 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/51713/revisions/1/mbox/

== Known issues ==

  Here are the changes found in Patchwork_10639 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_contexts:
      fi-icl-u:           NOTRUN -> DMESG-FAIL (fdo#108569)

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362)

    
    ==== Possible fixes ====

    igt@drv_module_reload@basic-reload:
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

    igt@gem_exec_suspend@basic-s3:
      fi-icl-u:           INCOMPLETE (fdo#107713) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
      fi-byt-clapper:     FAIL (fdo#107362, fdo#103191) -> PASS

    
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
  fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
  fdo#108569 https://bugs.freedesktop.org/show_bug.cgi?id=108569


== Participating hosts (49 -> 42) ==

  Missing    (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-apl-guc fi-ctg-p8600 fi-glk-j4005 


== Build changes ==

    * Linux: CI_DRM_5052 -> Patchwork_10639

  CI_DRM_5052: 24b6ea5d5f299c5e9e6b4d92068651f7f1555bd0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4699: 1270ec553741ac20c45178d2b26f9a9562ea565f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10639: a6b96e81cb3d3d642a32967d090d6cbc067dca7a @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

a6b96e81cb3d drm/i915: Kill WA 0826
9c1684e0212b drm/i915: Kill WA 0528
cb2ab46ffd52 drm/i915: Introduce HAS_NV12 and define WA 0870.
06e251358bb0 drm/i915/cnl: Remove useless CNL A-stepping workarounds.
06502866f130 drm/i915: Remove CNL from WA 827

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10639/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.SPARSE: warning for series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)
URL   : https://patchwork.freedesktop.org/series/51713/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: Remove CNL from WA 827
Okay!

Commit: drm/i915/cnl: Remove useless CNL A-stepping workarounds.
Okay!

Commit: drm/i915: Introduce HAS_NV12 and define WA 0870.
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3699:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3700:16: warning: expression using sizeof(void)

Commit: drm/i915: Kill WA 0528
Okay!

Commit: drm/i915: Kill WA 0826
Okay!

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)
URL   : https://patchwork.freedesktop.org/series/51713/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_5052 -> Patchwork_10642 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/51713/revisions/3/mbox/

== Known issues ==

  Here are the changes found in Patchwork_10642 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_flip@basic-flip-vs-modeset:
      fi-skl-6700hq:      PASS -> DMESG-WARN (fdo#105998)

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362, fdo#103191)

    
    ==== Possible fixes ====

    igt@drv_module_reload@basic-reload:
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

    igt@gem_exec_suspend@basic-s3:
      fi-icl-u:           INCOMPLETE (fdo#107713) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
      fi-byt-clapper:     FAIL (fdo#107362, fdo#103191) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-b:
      fi-byt-clapper:     FAIL (fdo#107362) -> PASS

    
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
  fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718


== Participating hosts (49 -> 43) ==

  Missing    (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510 


== Build changes ==

    * Linux: CI_DRM_5052 -> Patchwork_10642

  CI_DRM_5052: 24b6ea5d5f299c5e9e6b4d92068651f7f1555bd0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4699: 1270ec553741ac20c45178d2b26f9a9562ea565f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10642: 30a66566513ae9c51558214ec1b8ac084e05dcab @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

30a66566513a drm/i915: Kill WA 0826
15d0006b4783 drm/i915: Kill WA 0528
fe56270f324f drm/i915: Introduce HAS_NV12 and define WA 0870.
74b6c8c7fca3 drm/i915/cnl: Remove useless CNL A-stepping workarounds.
85b839db56a9 drm/i915: Remove CNL from WA 827

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10642/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev3)
URL   : https://patchwork.freedesktop.org/series/51713/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_5052_full -> Patchwork_10642_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

  Here are the changes found in Patchwork_10642_full that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_schedule@pi-ringfull-bsd:
      shard-skl:          NOTRUN -> FAIL (fdo#103158)

    igt@kms_busy@extended-modeset-hang-newfb-render-a:
      shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
      shard-snb:          NOTRUN -> DMESG-WARN (fdo#107956) +1

    igt@kms_cursor_crc@cursor-128x42-offscreen:
      shard-skl:          NOTRUN -> FAIL (fdo#103232)

    igt@kms_cursor_crc@cursor-256x256-random:
      shard-apl:          PASS -> FAIL (fdo#103232) +1

    igt@kms_cursor_crc@cursor-256x256-suspend:
      shard-skl:          NOTRUN -> INCOMPLETE (fdo#104108)

    igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled:
      shard-skl:          NOTRUN -> FAIL (fdo#103232, fdo#103184)

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-skl:          NOTRUN -> FAIL (fdo#108134)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
      shard-apl:          PASS -> FAIL (fdo#103167) +1

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu:
      shard-skl:          NOTRUN -> FAIL (fdo#105682)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
      shard-skl:          NOTRUN -> FAIL (fdo#103167) +4

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-glk:          PASS -> FAIL (fdo#103167)

    igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
      shard-skl:          NOTRUN -> FAIL (fdo#107815, fdo#108145)

    igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
      shard-skl:          NOTRUN -> FAIL (fdo#108145)

    igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
      shard-apl:          NOTRUN -> FAIL (fdo#108145)

    igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
      shard-apl:          PASS -> FAIL (fdo#103166) +1

    igt@kms_setmode@basic:
      shard-kbl:          PASS -> FAIL (fdo#99912)
      shard-snb:          NOTRUN -> FAIL (fdo#99912)

    igt@kms_sysfs_edid_timing:
      shard-skl:          NOTRUN -> FAIL (fdo#100047)

    igt@perf@blocking:
      shard-hsw:          PASS -> FAIL (fdo#102252)

    
    ==== Possible fixes ====

    igt@gem_eio@in-flight-contexts-1us:
      shard-glk:          FAIL (fdo#105957) -> PASS

    igt@kms_color@pipe-a-degamma:
      shard-apl:          FAIL (fdo#108145, fdo#104782) -> PASS

    igt@kms_cursor_crc@cursor-128x128-suspend:
      shard-apl:          FAIL (fdo#103232, fdo#103191) -> PASS

    igt@kms_cursor_crc@cursor-64x64-dpms:
      shard-apl:          FAIL (fdo#103232) -> PASS +1

    igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
      shard-glk:          DMESG-WARN (fdo#106538, fdo#105763) -> PASS

    igt@kms_draw_crc@draw-method-rgb565-mmap-wc-ytiled:
      shard-glk:          FAIL (fdo#103184) -> PASS +1

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt:
      shard-apl:          FAIL (fdo#103167) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
      shard-glk:          FAIL (fdo#103167) -> PASS +1

    igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
      shard-apl:          INCOMPLETE (fdo#103927) -> PASS +1

    igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
      shard-skl:          FAIL (fdo#107815) -> PASS

    igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
      shard-apl:          FAIL (fdo#103166) -> PASS

    igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
      shard-glk:          FAIL (fdo#103166) -> PASS +2

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS

    igt@kms_vblank@pipe-c-wait-busy:
      shard-kbl:          DMESG-WARN (fdo#103558, fdo#105602) -> PASS +3

    igt@pm_rpm@system-suspend:
      shard-skl:          INCOMPLETE (fdo#107773, fdo#107807, fdo#104108) -> PASS

    
  fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
  fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
  fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
  fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
  fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
  fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
  fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
  fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
  fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
  fdo#105957 https://bugs.freedesktop.org/show_bug.cgi?id=105957
  fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
  fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
  fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
  fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
  fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
  fdo#108134 https://bugs.freedesktop.org/show_bug.cgi?id=108134
  fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


== Participating hosts (6 -> 6) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_5052 -> Patchwork_10642

  CI_DRM_5052: 24b6ea5d5f299c5e9e6b4d92068651f7f1555bd0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4699: 1270ec553741ac20c45178d2b26f9a9562ea565f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10642: 30a66566513ae9c51558214ec1b8ac084e05dcab @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10642/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 3/5] drm/i915: Introduce HAS_NV12 and define WA 0870.

[Ville Syrjälä]

On Mon, Oct 29, 2018 at 04:00:42PM -0700, Rodrigo Vivi wrote:
> Let's introduce HAS_NV12 to check for feature itself
> than spread the platform checks everywhere.
> 
> Also let's introduce the WA number that is the
> cause of having NV12 disabled on both SLK and BXT.
> 
> According to Spec:
> 
> WA 0870: "Display flickers with NV12 video playback in
> Y tiling mode.
> WA: Use YUV422 surface format instead of NV12."
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h          | 1 +
>  drivers/gpu/drm/i915/i915_pci.c          | 5 +++++
>  drivers/gpu/drm/i915/intel_device_info.h | 1 +
>  drivers/gpu/drm/i915/intel_display.c     | 7 +++----
>  drivers/gpu/drm/i915/intel_sprite.c      | 2 +-
>  5 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index c9e5bab6861b..57ea094054d5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2630,6 +2630,7 @@ intel_info(const struct drm_i915_private *dev_priv)
>  #define HAS_RC6pp(dev_priv)		 (false) /* HW was never validated */
>  
>  #define HAS_CSR(dev_priv)	((dev_priv)->info.has_csr)
> +#define HAS_NV12(dev_priv)	((dev_priv)->info.has_nv12)
>  
>  #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
>  #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 44e745921ac1..eb797c1ef842 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -462,6 +462,7 @@ static const struct intel_device_info intel_cherryview_info = {
>  	GEN(9), \
>  	GEN9_DEFAULT_PAGE_SIZES, \
>  	.has_logical_ring_preemption = 1, \
> +	.has_nv12 = 1, \
>  	.has_csr = 1, \
>  	.has_guc = 1, \
>  	.has_ipc = 1, \
> @@ -471,6 +472,8 @@ static const struct intel_device_info intel_cherryview_info = {
>  	GEN9_FEATURES, \
>  	/* Display WA #0477 WaDisableIPC: skl */ \
>  	.has_ipc = 0, \
> +	/* Display WA #0870: skl */ \
> +	.has_nv12 = 0, \
>  	PLATFORM(INTEL_SKYLAKE)
>  
>  static const struct intel_device_info intel_skylake_gt1_info = {
> @@ -531,6 +534,8 @@ static const struct intel_device_info intel_broxton_info = {
>  	GEN9_LP_FEATURES,
>  	PLATFORM(INTEL_BROXTON),
>  	.ddb_size = 512,
> +	/* Display WA #0870: bxt */
> +	.has_nv12 = 0,
>  };
>  
>  static const struct intel_device_info intel_geminilake_info = {
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index b4c2c4eae78b..ba9e9c59dc6c 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -104,6 +104,7 @@ enum intel_ppgtt {
>  	func(has_logical_ring_contexts); \
>  	func(has_logical_ring_elsq); \
>  	func(has_logical_ring_preemption); \
> +	func(has_nv12); \
>  	func(has_overlay); \
>  	func(has_pooled_eu); \
>  	func(has_psr); \
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index dd88ffe9e273..14f6f66b00d2 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -470,7 +470,7 @@ skl_wa_528(struct drm_i915_private *dev_priv, int pipe, bool enable)
>  static void
>  skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
>  {
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> +	if (!HAS_NV12(dev_priv))
>  		return;
>  
>  	if (enable)
> @@ -5239,7 +5239,7 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
>  	if (!crtc_state->nv12_planes)
>  		return false;
>  
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> +	if (!HAS_NV12(dev_priv))
>  		return false;

The above three checks (you missed skl_wa_528()) can be removed entirely.
The code won't be reached unless at least one plane uses NV12.

>  
>  	/* WA Display #0827: Gen9:all */
> @@ -14519,8 +14519,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
>  		}
>  		break;
>  	case DRM_FORMAT_NV12:
> -		if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
> -		    IS_BROXTON(dev_priv)) {
> +		if (!HAS_NV12(dev_priv)) {
>  			DRM_DEBUG_KMS("unsupported pixel format: %s\n",
>  				      drm_get_format_name(mode_cmd->pixel_format,
>  							  &format_name));

Undead code. The kill-a-zombie (tm) potion should kick in soon:
https://patchwork.freedesktop.org/patch/259041/

> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index e7c95ec879cc..582a2972c90d 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1868,7 +1868,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
>  	if (INTEL_GEN(dev_priv) >= 11)
>  		return plane_id <= PLANE_SPRITE3;
>  
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> +	if (!HAS_NV12(dev_priv))
>  		return false;

So this is the only thing left in the end. Adding a device info flag
for this is overkill IMO. The w/a name we should add of course.

>  
>  	if (IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C)
> -- 
> 2.19.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 4/5] drm/i915: Kill WA 0528

[Ville Syrjälä]

On Mon, Oct 29, 2018 at 04:00:43PM -0700, Rodrigo Vivi wrote:
> First of all I believe this WA as written here was wrong.
> 
> Because it is listed on BSpec only for SKL and BXT, exactly
> the only 2 platforms skipped here.
> 
> But also it is written there that we don't need this WA
> anymore:
> "This workaround is no longer needed since NV12 support is
> dropped for the affected projects in #0870."

Ahd here is the missing skl_wa_528() :)

The w/a still seems to say it would be need with ccs. But
the w/a is only listed for pre-production steppins so I guess
it can go (I didn't find any counter argument in the spec).

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> SO, let's kill it.
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 14f6f66b00d2..aacc340d4eec 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -455,18 +455,6 @@ static const struct intel_limit intel_limits_bxt = {
>  	.p2 = { .p2_slow = 1, .p2_fast = 20 },
>  };
>  
> -static void
> -skl_wa_528(struct drm_i915_private *dev_priv, int pipe, bool enable)
> -{
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> -		return;
> -
> -	if (enable)
> -		I915_WRITE(CHICKEN_PIPESL_1(pipe), HSW_FBCQ_DIS);
> -	else
> -		I915_WRITE(CHICKEN_PIPESL_1(pipe), 0);
> -}
> -
>  static void
>  skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
>  {
> @@ -5286,7 +5274,6 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
>  	if (needs_nv12_wa(dev_priv, old_crtc_state) &&
>  	    !needs_nv12_wa(dev_priv, pipe_config)) {
>  		skl_wa_clkgate(dev_priv, crtc->pipe, false);
> -		skl_wa_528(dev_priv, crtc->pipe, false);
>  	}
>  }
>  
> @@ -5326,7 +5313,6 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
>  	if (!needs_nv12_wa(dev_priv, old_crtc_state) &&
>  	    needs_nv12_wa(dev_priv, pipe_config)) {
>  		skl_wa_clkgate(dev_priv, crtc->pipe, true);
> -		skl_wa_528(dev_priv, crtc->pipe, true);
>  	}
>  
>  	/*
> -- 
> 2.19.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 5/5] drm/i915: Kill WA 0826

[Ville Syrjälä]

On Mon, Oct 29, 2018 at 04:00:44PM -0700, Rodrigo Vivi wrote:
> According to BSpec this is not needed anymore:
> 
> "This workaround is no longer needed since NV12
> support is dropped for the affected projects.
> "
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Making it harder for me to keep testing NV12 on skl :P

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 9ee96016cfd5..f202b9b3b796 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4823,16 +4823,6 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
>  		}
>  	}
>  
> -	/*
> -	 * Display WA #826 (SKL:ALL, BXT:ALL)
> -	 * disable wm level 1-7 on NV12 planes
> -	 */
> -	if (wp->is_planar && level >= 1 &&
> -	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> -		result->plane_en = false;
> -		return 0;
> -	}
> -
>  	/* The number of lines are ignored for the level 0 watermark. */
>  	result->plane_res_b = res_blocks;
>  	result->plane_res_l = res_lines;
> -- 
> 2.19.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915: Define WA 0870 and kill dead code.

[Rodrigo Vivi]

Let's introduce the WA number that is the
cause of having NV12 disabled on both SLK and BXT.

According to Spec:

WA 0870: "Display flickers with NV12 video playback in
Y tiling mode.
WA: Use YUV422 surface format instead of NV12."

v2: remove the useless dead code and consequently
    avoiding device info flag. (Ville)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 6 ------
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ce60aefc14d7..360d248a59b4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -458,9 +458,6 @@ static const struct intel_limit intel_limits_bxt = {
 static void
 skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
 {
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
-		return;
-
 	if (enable)
 		I915_WRITE(CLKGATE_DIS_PSL(pipe),
 			   DUPS1_GATING_DIS | DUPS2_GATING_DIS);
@@ -5227,9 +5224,6 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
 	if (!crtc_state->nv12_planes)
 		return false;
 
-	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
-		return false;
-
 	if ((IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv)) ||
 	    IS_CANNONLAKE(dev_priv))
 		return true;
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index e7c95ec879cc..370c827294d8 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1868,6 +1868,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
 	if (INTEL_GEN(dev_priv) >= 11)
 		return plane_id <= PLANE_SPRITE3;
 
+	/* Display WA #0870: skl, bxt */
 	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
 		return false;
 
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev4)

[Patchwork]

== Series Details ==

Series: series starting with [1/5] drm/i915: Remove CNL from WA 827 (rev4)
URL   : https://patchwork.freedesktop.org/series/51713/
State : failure

== Summary ==

Applying: drm/i915: Remove CNL from WA 827
Applying: drm/i915/cnl: Remove useless CNL A-stepping workarounds.
Applying: drm/i915: Define WA 0870 and kill dead code.
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_display.c).
error: could not build fake ancestor
Patch failed at 0003 drm/i915: Define WA 0870 and kill dead code.
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Define WA 0870 and kill dead code.

[Ville Syrjälä]

On Tue, Oct 30, 2018 at 03:15:55PM -0700, Rodrigo Vivi wrote:
> Let's introduce the WA number that is the
> cause of having NV12 disabled on both SLK and BXT.
> 
> According to Spec:
> 
> WA 0870: "Display flickers with NV12 video playback in
> Y tiling mode.
> WA: Use YUV422 surface format instead of NV12."
> 
> v2: remove the useless dead code and consequently
>     avoiding device info flag. (Ville)
> 
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 ------
>  drivers/gpu/drm/i915/intel_sprite.c  | 1 +
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ce60aefc14d7..360d248a59b4 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -458,9 +458,6 @@ static const struct intel_limit intel_limits_bxt = {
>  static void
>  skl_wa_clkgate(struct drm_i915_private *dev_priv, int pipe, bool enable)
>  {
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> -		return;
> -
>  	if (enable)
>  		I915_WRITE(CLKGATE_DIS_PSL(pipe),
>  			   DUPS1_GATING_DIS | DUPS2_GATING_DIS);
> @@ -5227,9 +5224,6 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv,
>  	if (!crtc_state->nv12_planes)
>  		return false;
>  
> -	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> -		return false;
> -
>  	if ((IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv)) ||
>  	    IS_CANNONLAKE(dev_priv))
>  		return true;
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index e7c95ec879cc..370c827294d8 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1868,6 +1868,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
>  	if (INTEL_GEN(dev_priv) >= 11)
>  		return plane_id <= PLANE_SPRITE3;
>  
> +	/* Display WA #0870: skl, bxt */
>  	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
>  		return false;
>  
> -- 
> 2.19.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx