* [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers
@ 2022-09-30 10:42 Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
` (6 more replies)
0 siblings, 7 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:42 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We are neglegting to consider all the new CCS modifiers as
Y-tiled in the watermark calculations. So we are incorrectrly
calculation the watermarks as if dealing with a linear surface.
Ville Syrjälä (5):
drm/i915: Fix watermark calculations for gen12+ CCS modifiers
drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier
drm/i915: Fix watermark calculations for DG2 CCS modifiers
drm/i915: Fix watermark calculations for DG2 CCS+CC modifier
drm/i915: Simplify modifier lookup in watermark code
drivers/gpu/drm/i915/display/intel_fb.c | 13 +++++++++++++
drivers/gpu/drm/i915/display/intel_fb.h | 1 +
drivers/gpu/drm/i915/display/skl_watermark.c | 10 +++-------
3 files changed, 17 insertions(+), 7 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 1/5] drm/i915: Fix watermark calculations for gen12+ CCS modifiers
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
@ 2022-09-30 10:42 ` Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:42 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the gen12+ CCS modifiers into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking these
Y-tiled modifiers are linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 2dfbf9d2873a ("drm/i915/tgl: Gen-12 display can decompress surfaces compressed by the media engine")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 01b0932757ed..49fc5e2b56fd 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1710,10 +1710,14 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_4_TILED ||
modifier == I915_FORMAT_MOD_Yf_TILED ||
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+ modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+ modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/5] drm/i915: Fix watermark calculations for gen12+ CCS modifiers
@ 2022-09-30 10:42 ` Ville Syrjala
0 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:42 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the gen12+ CCS modifiers into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking these
Y-tiled modifiers are linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 2dfbf9d2873a ("drm/i915/tgl: Gen-12 display can decompress surfaces compressed by the media engine")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 01b0932757ed..49fc5e2b56fd 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1710,10 +1710,14 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_4_TILED ||
modifier == I915_FORMAT_MOD_Yf_TILED ||
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+ modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+ modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 2/5] drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
@ 2022-09-30 10:42 ` Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:42 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the gen12+ CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
Y-tiled modifier is linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: d1e2775e9b96 ("drm/i915/tgl: Add Clear Color support for TGL Render Decompression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 49fc5e2b56fd..3676662897e7 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1712,12 +1712,14 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/5] drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier
@ 2022-09-30 10:42 ` Ville Syrjala
0 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:42 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the gen12+ CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
Y-tiled modifier is linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: d1e2775e9b96 ("drm/i915/tgl: Add Clear Color support for TGL Render Decompression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 49fc5e2b56fd..3676662897e7 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1712,12 +1712,14 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 3/5] drm/i915: Fix watermark calculations for DG2 CCS modifiers
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
@ 2022-09-30 10:43 ` Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:43 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the DG2 CCS modifiers into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking these
tile-4 modifiers are linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 4c3afa72138c ("drm/i915/dg2: Add support for DG2 render and media compression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 3676662897e7..a120d49b95ca 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1713,13 +1713,17 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/5] drm/i915: Fix watermark calculations for DG2 CCS modifiers
@ 2022-09-30 10:43 ` Ville Syrjala
0 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:43 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the DG2 CCS modifiers into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking these
tile-4 modifiers are linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 4c3afa72138c ("drm/i915/dg2: Add support for DG2 render and media compression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 3676662897e7..a120d49b95ca 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1713,13 +1713,17 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
+ modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 4/5] drm/i915: Fix watermark calculations for DG2 CCS+CC modifier
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
@ 2022-09-30 10:43 ` Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
` (5 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:43 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the DG2 CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
tile-4 modifier is linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 680025dcc400 ("drm/i915/dg2: Add support for DG2 clear color compression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index a120d49b95ca..18178b01375e 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1715,7 +1715,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
@@ -1723,7 +1724,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/5] drm/i915: Fix watermark calculations for DG2 CCS+CC modifier
@ 2022-09-30 10:43 ` Ville Syrjala
0 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:43 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Take the DG2 CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
tile-4 modifier is linear.
The rc_surface part is actually a nop since that is not used
for any glk+ platform.
Cc: stable@vger.kernel.org
Fixes: 680025dcc400 ("drm/i915/dg2: Add support for DG2 clear color compression")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index a120d49b95ca..18178b01375e 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1715,7 +1715,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
@@ -1723,7 +1724,8 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
+ modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
` (3 preceding siblings ...)
2022-09-30 10:43 ` Ville Syrjala
@ 2022-09-30 10:43 ` Ville Syrjala
2022-09-30 11:22 ` Juha-Pekka Heikkila
2022-09-30 11:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix watermark calculations with various CCS modifiers Patchwork
2022-10-01 8:37 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 1 reply; 16+ messages in thread
From: Ville Syrjala @ 2022-09-30 10:43 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Replace the huge modifier lists in the watermark code with
a few calls to intel_fb.c.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_fb.c | 13 ++++++++++++
drivers/gpu/drm/i915/display/intel_fb.h | 1 +
drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index eefa33c555ac..63137ae5ab21 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
return (caps & mask) == mask;
}
+/**
+ * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
+ * @modifier: Modifier to check
+ *
+ * Returns:
+ * Returns %true if @modifier is a tiled modifier.
+ */
+bool intel_fb_is_tiled_modifier(u64 modifier)
+{
+ return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
+ INTEL_PLANE_CAP_TILING_MASK);
+}
+
/**
* intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
* @modifier: Modifier to check
diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index 12386f13a4e0..4662b812b934 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -29,6 +29,7 @@ struct intel_plane_state;
#define INTEL_PLANE_CAP_TILING_Yf BIT(5)
#define INTEL_PLANE_CAP_TILING_4 BIT(6)
+bool intel_fb_is_tiled_modifier(u64 modifier);
bool intel_fb_is_ccs_modifier(u64 modifier);
bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
bool intel_fb_is_mc_ccs_modifier(u64 modifier);
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 18178b01375e..0715bb308989 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
return -EINVAL;
}
- wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
- modifier == I915_FORMAT_MOD_4_TILED ||
- modifier == I915_FORMAT_MOD_Yf_TILED ||
- modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
- wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
- modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
- modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
+ wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
+ intel_fb_is_tiled_modifier(modifier);
+ wp->rc_surface = intel_fb_is_ccs_modifier(modifier);
wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
wp->width = width;
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code
2022-09-30 10:43 ` [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code Ville Syrjala
@ 2022-09-30 11:22 ` Juha-Pekka Heikkila
2022-09-30 11:31 ` Ville Syrjälä
0 siblings, 1 reply; 16+ messages in thread
From: Juha-Pekka Heikkila @ 2022-09-30 11:22 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
I had earlier this patch which look like it does mostly the same
https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
With exception to mc ccs, earlier Imre said mc ccs must not be
considered here.
/Juha-Pekka
On 30.9.2022 13.43, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Replace the huge modifier lists in the watermark code with
> a few calls to intel_fb.c.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fb.c | 13 ++++++++++++
> drivers/gpu/drm/i915/display/intel_fb.h | 1 +
> drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
> 3 files changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index eefa33c555ac..63137ae5ab21 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
> return (caps & mask) == mask;
> }
>
> +/**
> + * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
> + * @modifier: Modifier to check
> + *
> + * Returns:
> + * Returns %true if @modifier is a tiled modifier.
> + */
> +bool intel_fb_is_tiled_modifier(u64 modifier)
> +{
> + return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
> + INTEL_PLANE_CAP_TILING_MASK);
> +}
> +
> /**
> * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
> * @modifier: Modifier to check
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index 12386f13a4e0..4662b812b934 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -29,6 +29,7 @@ struct intel_plane_state;
> #define INTEL_PLANE_CAP_TILING_Yf BIT(5)
> #define INTEL_PLANE_CAP_TILING_4 BIT(6)
>
> +bool intel_fb_is_tiled_modifier(u64 modifier);
> bool intel_fb_is_ccs_modifier(u64 modifier);
> bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
> bool intel_fb_is_mc_ccs_modifier(u64 modifier);
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 18178b01375e..0715bb308989 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
> return -EINVAL;
> }
>
> - wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
> - modifier == I915_FORMAT_MOD_4_TILED ||
> - modifier == I915_FORMAT_MOD_Yf_TILED ||
> - modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
> - wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> + wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
> + intel_fb_is_tiled_modifier(modifier);
> + wp->rc_surface = intel_fb_is_ccs_modifier(modifier);
I had earlier this patch which look like it did mostly the same
https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
With exception to mc ccs, earlier Imre said mc ccs must not be
considered here.
/Juha-Pekka
> wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
>
> wp->width = width;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code
2022-09-30 11:22 ` Juha-Pekka Heikkila
@ 2022-09-30 11:31 ` Ville Syrjälä
2022-09-30 11:47 ` Juha-Pekka Heikkila
0 siblings, 1 reply; 16+ messages in thread
From: Ville Syrjälä @ 2022-09-30 11:31 UTC (permalink / raw)
To: Juha-Pekka Heikkila; +Cc: intel-gfx
On Fri, Sep 30, 2022 at 02:22:08PM +0300, Juha-Pekka Heikkila wrote:
> I had earlier this patch which look like it does mostly the same
> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
>
> With exception to mc ccs, earlier Imre said mc ccs must not be
> considered here.
For the rc_surface thing? Doesn't actually matter what we put there
on glk+ since it's only used in skl/bxt code.
>
> /Juha-Pekka
>
> On 30.9.2022 13.43, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Replace the huge modifier lists in the watermark code with
> > a few calls to intel_fb.c.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_fb.c | 13 ++++++++++++
> > drivers/gpu/drm/i915/display/intel_fb.h | 1 +
> > drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
> > 3 files changed, 17 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> > index eefa33c555ac..63137ae5ab21 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fb.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> > @@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
> > return (caps & mask) == mask;
> > }
> >
> > +/**
> > + * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
> > + * @modifier: Modifier to check
> > + *
> > + * Returns:
> > + * Returns %true if @modifier is a tiled modifier.
> > + */
> > +bool intel_fb_is_tiled_modifier(u64 modifier)
> > +{
> > + return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
> > + INTEL_PLANE_CAP_TILING_MASK);
> > +}
> > +
> > /**
> > * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
> > * @modifier: Modifier to check
> > diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> > index 12386f13a4e0..4662b812b934 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fb.h
> > +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> > @@ -29,6 +29,7 @@ struct intel_plane_state;
> > #define INTEL_PLANE_CAP_TILING_Yf BIT(5)
> > #define INTEL_PLANE_CAP_TILING_4 BIT(6)
> >
> > +bool intel_fb_is_tiled_modifier(u64 modifier);
> > bool intel_fb_is_ccs_modifier(u64 modifier);
> > bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
> > bool intel_fb_is_mc_ccs_modifier(u64 modifier);
> > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> > index 18178b01375e..0715bb308989 100644
> > --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> > @@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
> > return -EINVAL;
> > }
> >
> > - wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
> > - modifier == I915_FORMAT_MOD_4_TILED ||
> > - modifier == I915_FORMAT_MOD_Yf_TILED ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> > - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> > wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
> > - wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> > - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> > - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> > - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> > + wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
> > + intel_fb_is_tiled_modifier(modifier);
> > + wp->rc_surface = intel_fb_is_ccs_modifier(modifier);
>
> I had earlier this patch which look like it did mostly the same
> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
>
> With exception to mc ccs, earlier Imre said mc ccs must not be
> considered here.
>
> /Juha-Pekka
>
> > wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
> >
> > wp->width = width;
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix watermark calculations with various CCS modifiers
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
` (4 preceding siblings ...)
2022-09-30 10:43 ` [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code Ville Syrjala
@ 2022-09-30 11:33 ` Patchwork
2022-10-01 8:37 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2022-09-30 11:33 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 13459 bytes --]
== Series Details ==
Series: drm/i915: Fix watermark calculations with various CCS modifiers
URL : https://patchwork.freedesktop.org/series/109303/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12202 -> Patchwork_109303v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/index.html
Participating hosts (47 -> 47)
------------------------------
Additional (3): bat-dg2-8 bat-adlp-4 bat-dg1-5
Missing (3): fi-ctg-p8600 fi-bdw-samus fi-hsw-4200u
Known issues
------------
Here are the changes found in Patchwork_109303v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@nullptr:
- bat-dg1-5: NOTRUN -> [SKIP][1] ([i915#2582]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@fbdev@nullptr.html
* igt@fbdev@read:
- bat-adlp-4: NOTRUN -> [SKIP][2] ([i915#2582]) +4 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@fbdev@read.html
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adlp-4: NOTRUN -> [SKIP][3] ([i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_mmap@basic:
- bat-dg1-5: NOTRUN -> [SKIP][4] ([i915#4083])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@gem_mmap@basic.html
* igt@gem_tiled_blits@basic:
- bat-dg1-5: NOTRUN -> [SKIP][5] ([i915#4077]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@gem_tiled_blits@basic.html
* igt@gem_tiled_pread_basic:
- bat-dg1-5: NOTRUN -> [SKIP][6] ([i915#4079]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@gem_tiled_pread_basic.html
- bat-adlp-4: NOTRUN -> [SKIP][7] ([i915#3282])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-adlp-4: NOTRUN -> [SKIP][8] ([i915#1155])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@i915_pm_backlight@basic-brightness.html
- bat-dg1-5: NOTRUN -> [SKIP][9] ([i915#1155])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_pm_rps@basic-api:
- bat-adlp-4: NOTRUN -> [SKIP][10] ([i915#6621])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@i915_pm_rps@basic-api.html
- bat-dg1-5: NOTRUN -> [SKIP][11] ([i915#6621])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@i915_pm_rps@basic-api.html
* igt@kms_addfb_basic@basic-x-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][12] ([i915#4212]) +7 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_addfb_basic@basic-x-tiled-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][13] ([i915#4215])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_busy@basic:
- bat-dg1-5: NOTRUN -> [SKIP][14] ([i915#1845] / [i915#4303])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_busy@basic.html
* igt@kms_chamelium@dp-crc-fast:
- bat-adlp-4: NOTRUN -> [SKIP][15] ([fdo#111827]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_chamelium@dp-crc-fast.html
- bat-dg1-5: NOTRUN -> [SKIP][16] ([fdo#111827]) +8 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-kefka: [PASS][17] -> [FAIL][18] ([i915#6298])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
* igt@kms_flip@basic-flip-vs-wf_vblank:
- bat-adlp-4: NOTRUN -> [SKIP][19] ([i915#3637]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_flip@basic-flip-vs-wf_vblank.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-adlp-4: NOTRUN -> [SKIP][20] ([i915#4093]) +3 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_force_connector_basic@force-load-detect.html
- bat-dg1-5: NOTRUN -> [SKIP][21] ([fdo#109285])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_frontbuffer_tracking@basic:
- bat-adlp-4: NOTRUN -> [SKIP][22] ([i915#4342])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_pipe_crc_basic@nonblocking-crc:
- bat-dg1-5: NOTRUN -> [SKIP][23] ([i915#4078]) +14 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_pipe_crc_basic@nonblocking-crc.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence:
- bat-adlp-4: NOTRUN -> [SKIP][24] ([i915#3546]) +10 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html
* igt@kms_psr@primary_page_flip:
- bat-dg1-5: NOTRUN -> [SKIP][25] ([i915#1072] / [i915#4078]) +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_psr@primary_page_flip.html
* igt@kms_psr@sprite_plane_onoff:
- bat-adlp-4: NOTRUN -> [SKIP][26] ([i915#1072]) +3 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-5: NOTRUN -> [SKIP][27] ([i915#3555])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@kms_setmode@basic-clone-single-crtc.html
- bat-adlp-4: NOTRUN -> [SKIP][28] ([i915#3555] / [i915#4579])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-adlp-4: NOTRUN -> [SKIP][29] ([fdo#109295] / [i915#3546] / [i915#3708])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@prime_vgem@basic-fence-flip.html
- bat-dg1-5: NOTRUN -> [SKIP][30] ([i915#1845] / [i915#3708])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-fence-read:
- bat-dg1-5: NOTRUN -> [SKIP][31] ([i915#3708]) +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@prime_vgem@basic-fence-read.html
* igt@prime_vgem@basic-gtt:
- bat-dg1-5: NOTRUN -> [SKIP][32] ([i915#3708] / [i915#4077]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@prime_vgem@basic-gtt.html
* igt@prime_vgem@basic-userptr:
- bat-adlp-4: NOTRUN -> [SKIP][33] ([fdo#109295] / [i915#3301] / [i915#3708])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@prime_vgem@basic-userptr.html
- bat-dg1-5: NOTRUN -> [SKIP][34] ([i915#3708] / [i915#4873])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg1-5/igt@prime_vgem@basic-userptr.html
* igt@prime_vgem@basic-write:
- bat-adlp-4: NOTRUN -> [SKIP][35] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-adlp-4/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3@lmem0:
- {bat-dg2-11}: [DMESG-WARN][36] ([i915#6816]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/bat-dg2-11/igt@gem_exec_suspend@basic-s3@lmem0.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-dg2-11/igt@gem_exec_suspend@basic-s3@lmem0.html
* igt@i915_selftest@live@gt_pm:
- {bat-rpls-2}: [DMESG-FAIL][38] ([i915#4258]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@requests:
- {bat-rpls-1}: [INCOMPLETE][40] ([i915#4983]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/bat-rpls-1/igt@i915_selftest@live@requests.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/bat-rpls-1/igt@i915_selftest@live@requests.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4093]: https://gitlab.freedesktop.org/drm/intel/issues/4093
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4303]: https://gitlab.freedesktop.org/drm/intel/issues/4303
[i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5278]: https://gitlab.freedesktop.org/drm/intel/issues/5278
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5537]: https://gitlab.freedesktop.org/drm/intel/issues/5537
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6434]: https://gitlab.freedesktop.org/drm/intel/issues/6434
[i915#6559]: https://gitlab.freedesktop.org/drm/intel/issues/6559
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6816]: https://gitlab.freedesktop.org/drm/intel/issues/6816
Build changes
-------------
* Linux: CI_DRM_12202 -> Patchwork_109303v1
CI-20190529: 20190529
CI_DRM_12202: 0b9f0501c9541cf79fdfb43a7760360a81453d88 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6670: d618e9865fe5cbaf511ca43503abad442605d0a5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_109303v1: 0b9f0501c9541cf79fdfb43a7760360a81453d88 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
4c44549124d5 drm/i915: Simplify modifier lookup in watermark code
d9466149bedc drm/i915: Fix watermark calculations for DG2 CCS+CC modifier
73516ad9a55b drm/i915: Fix watermark calculations for DG2 CCS modifiers
8edebbf63fdb drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier
4800213599f1 drm/i915: Fix watermark calculations for gen12+ CCS modifiers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/index.html
[-- Attachment #2: Type: text/html, Size: 15442 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code
2022-09-30 11:31 ` Ville Syrjälä
@ 2022-09-30 11:47 ` Juha-Pekka Heikkila
2022-09-30 12:13 ` Ville Syrjälä
0 siblings, 1 reply; 16+ messages in thread
From: Juha-Pekka Heikkila @ 2022-09-30 11:47 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On 30.9.2022 14.31, Ville Syrjälä wrote:
> On Fri, Sep 30, 2022 at 02:22:08PM +0300, Juha-Pekka Heikkila wrote:
>> I had earlier this patch which look like it does mostly the same
>> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
>>
>> With exception to mc ccs, earlier Imre said mc ccs must not be
>> considered here.
>
> For the rc_surface thing? Doesn't actually matter what we put there
> on glk+ since it's only used in skl/bxt code.
>
ack. Then this set is
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>>
>> /Juha-Pekka
>>
>> On 30.9.2022 13.43, Ville Syrjala wrote:
>>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>>
>>> Replace the huge modifier lists in the watermark code with
>>> a few calls to intel_fb.c.
>>>
>>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>> ---
>>> drivers/gpu/drm/i915/display/intel_fb.c | 13 ++++++++++++
>>> drivers/gpu/drm/i915/display/intel_fb.h | 1 +
>>> drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
>>> 3 files changed, 17 insertions(+), 19 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
>>> index eefa33c555ac..63137ae5ab21 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_fb.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
>>> @@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
>>> return (caps & mask) == mask;
>>> }
>>>
>>> +/**
>>> + * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
>>> + * @modifier: Modifier to check
>>> + *
>>> + * Returns:
>>> + * Returns %true if @modifier is a tiled modifier.
>>> + */
>>> +bool intel_fb_is_tiled_modifier(u64 modifier)
>>> +{
>>> + return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
>>> + INTEL_PLANE_CAP_TILING_MASK);
>>> +}
>>> +
>>> /**
>>> * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
>>> * @modifier: Modifier to check
>>> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
>>> index 12386f13a4e0..4662b812b934 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_fb.h
>>> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
>>> @@ -29,6 +29,7 @@ struct intel_plane_state;
>>> #define INTEL_PLANE_CAP_TILING_Yf BIT(5)
>>> #define INTEL_PLANE_CAP_TILING_4 BIT(6)
>>>
>>> +bool intel_fb_is_tiled_modifier(u64 modifier);
>>> bool intel_fb_is_ccs_modifier(u64 modifier);
>>> bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
>>> bool intel_fb_is_mc_ccs_modifier(u64 modifier);
>>> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
>>> index 18178b01375e..0715bb308989 100644
>>> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
>>> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
>>> @@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
>>> return -EINVAL;
>>> }
>>>
>>> - wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
>>> - modifier == I915_FORMAT_MOD_4_TILED ||
>>> - modifier == I915_FORMAT_MOD_Yf_TILED ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
>>> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
>>> wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
>>> - wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
>>> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
>>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
>>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
>>> + wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
>>> + intel_fb_is_tiled_modifier(modifier);
>>> + wp->rc_surface = intel_fb_is_ccs_modifier(modifier);
>>
>> I had earlier this patch which look like it did mostly the same
>> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
>>
>> With exception to mc ccs, earlier Imre said mc ccs must not be
>> considered here.
>>
>> /Juha-Pekka
>>
>>> wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
>>>
>>> wp->width = width;
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code
2022-09-30 11:47 ` Juha-Pekka Heikkila
@ 2022-09-30 12:13 ` Ville Syrjälä
0 siblings, 0 replies; 16+ messages in thread
From: Ville Syrjälä @ 2022-09-30 12:13 UTC (permalink / raw)
To: Juha-Pekka Heikkila; +Cc: intel-gfx
On Fri, Sep 30, 2022 at 02:47:32PM +0300, Juha-Pekka Heikkila wrote:
> On 30.9.2022 14.31, Ville Syrjälä wrote:
> > On Fri, Sep 30, 2022 at 02:22:08PM +0300, Juha-Pekka Heikkila wrote:
> >> I had earlier this patch which look like it does mostly the same
> >> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
> >>
> >> With exception to mc ccs, earlier Imre said mc ccs must not be
> >> considered here.
> >
> > For the rc_surface thing? Doesn't actually matter what we put there
> > on glk+ since it's only used in skl/bxt code.
> >
>
> ack. Then this set is
>
> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Thanks. We could s/rc_surface/ccs_surface/ as a followup
as well. That should make everything 100% consistent.
>
> >>
> >> /Juha-Pekka
> >>
> >> On 30.9.2022 13.43, Ville Syrjala wrote:
> >>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >>>
> >>> Replace the huge modifier lists in the watermark code with
> >>> a few calls to intel_fb.c.
> >>>
> >>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >>> ---
> >>> drivers/gpu/drm/i915/display/intel_fb.c | 13 ++++++++++++
> >>> drivers/gpu/drm/i915/display/intel_fb.h | 1 +
> >>> drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
> >>> 3 files changed, 17 insertions(+), 19 deletions(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> >>> index eefa33c555ac..63137ae5ab21 100644
> >>> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> >>> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> >>> @@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
> >>> return (caps & mask) == mask;
> >>> }
> >>>
> >>> +/**
> >>> + * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
> >>> + * @modifier: Modifier to check
> >>> + *
> >>> + * Returns:
> >>> + * Returns %true if @modifier is a tiled modifier.
> >>> + */
> >>> +bool intel_fb_is_tiled_modifier(u64 modifier)
> >>> +{
> >>> + return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
> >>> + INTEL_PLANE_CAP_TILING_MASK);
> >>> +}
> >>> +
> >>> /**
> >>> * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
> >>> * @modifier: Modifier to check
> >>> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> >>> index 12386f13a4e0..4662b812b934 100644
> >>> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> >>> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> >>> @@ -29,6 +29,7 @@ struct intel_plane_state;
> >>> #define INTEL_PLANE_CAP_TILING_Yf BIT(5)
> >>> #define INTEL_PLANE_CAP_TILING_4 BIT(6)
> >>>
> >>> +bool intel_fb_is_tiled_modifier(u64 modifier);
> >>> bool intel_fb_is_ccs_modifier(u64 modifier);
> >>> bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
> >>> bool intel_fb_is_mc_ccs_modifier(u64 modifier);
> >>> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> >>> index 18178b01375e..0715bb308989 100644
> >>> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> >>> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> >>> @@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
> >>> return -EINVAL;
> >>> }
> >>>
> >>> - wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED ||
> >>> - modifier == I915_FORMAT_MOD_Yf_TILED ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> >>> wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
> >>> - wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> >>> - modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> >>> + wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
> >>> + intel_fb_is_tiled_modifier(modifier);
> >>> + wp->rc_surface = intel_fb_is_ccs_modifier(modifier);
> >>
> >> I had earlier this patch which look like it did mostly the same
> >> https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4
> >>
> >> With exception to mc ccs, earlier Imre said mc ccs must not be
> >> considered here.
> >>
> >> /Juha-Pekka
> >>
> >>> wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
> >>>
> >>> wp->width = width;
> >
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Fix watermark calculations with various CCS modifiers
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
` (5 preceding siblings ...)
2022-09-30 11:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix watermark calculations with various CCS modifiers Patchwork
@ 2022-10-01 8:37 ` Patchwork
6 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2022-10-01 8:37 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 23155 bytes --]
== Series Details ==
Series: drm/i915: Fix watermark calculations with various CCS modifiers
URL : https://patchwork.freedesktop.org/series/109303/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12202_full -> Patchwork_109303v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (9 -> 9)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_109303v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@display-4x:
- shard-tglb: NOTRUN -> [SKIP][1] ([i915#1839])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@feature_discovery@display-4x.html
* igt@gem_exec_balancer@parallel-contexts:
- shard-iclb: [PASS][2] -> [SKIP][3] ([i915#4525])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@gem_exec_balancer@parallel-contexts.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@gem_exec_balancer@parallel-contexts.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [PASS][4] -> [FAIL][5] ([i915#2842]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-tglb8/igt@gem_exec_fair@basic-none-share@rcs0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb8/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none@bcs0:
- shard-tglb: NOTRUN -> [FAIL][6] ([i915#2842]) +4 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@gem_exec_fair@basic-none@bcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][7] -> [FAIL][8] ([i915#2842]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@gem_exec_fair@basic-throttle@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_lmem_swapping@heavy-multi:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@gem_lmem_swapping@heavy-multi.html
* igt@gem_lmem_swapping@parallel-random:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#4613])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-glk7/igt@gem_lmem_swapping@parallel-random.html
* igt@gem_vm_create@invalid-create:
- shard-snb: NOTRUN -> [SKIP][11] ([fdo#109271]) +25 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-snb2/igt@gem_vm_create@invalid-create.html
* igt@gen7_exec_parse@batch-without-end:
- shard-tglb: NOTRUN -> [SKIP][12] ([fdo#109289])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@gen7_exec_parse@batch-without-end.html
* igt@gen9_exec_parse@allowed-single:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([i915#5566] / [i915#716])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl6/igt@gen9_exec_parse@allowed-single.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl3/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][15] -> [FAIL][16] ([i915#3989] / [i915#454])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb8/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_rps@engine-order:
- shard-apl: [PASS][17] -> [FAIL][18] ([i915#6537])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl7/igt@i915_pm_rps@engine-order.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@i915_pm_rps@engine-order.html
* igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-tglb: NOTRUN -> [SKIP][19] ([i915#5286]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-tglb: NOTRUN -> [SKIP][20] ([fdo#111615])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
* igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#3886])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@kms_ccs@pipe-c-crc-primary-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][22] ([fdo#109271]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-glk7/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-4_tiled_dg2_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-crc-primary-rotation-180-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][23] ([i915#3689])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_ccs@pipe-d-crc-primary-rotation-180-y_tiled_ccs.html
* igt@kms_chamelium@dp-crc-single:
- shard-apl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@kms_chamelium@dp-crc-single.html
* igt@kms_chamelium@hdmi-edid-read:
- shard-tglb: NOTRUN -> [SKIP][25] ([fdo#109284] / [fdo#111827]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> [TIMEOUT][26] ([i915#1319])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@kms_content_protection@atomic-dpms.html
* igt@kms_content_protection@dp-mst-type-1:
- shard-tglb: NOTRUN -> [SKIP][27] ([i915#3116] / [i915#3299])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_content_protection@dp-mst-type-1.html
* igt@kms_cursor_crc@cursor-rapid-movement-32x32:
- shard-tglb: NOTRUN -> [SKIP][28] ([i915#3555])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_cursor_crc@cursor-rapid-movement-32x32.html
* igt@kms_flip@2x-absolute-wf_vblank-interruptible:
- shard-tglb: NOTRUN -> [SKIP][29] ([fdo#109274] / [fdo#111825] / [i915#3637])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_flip@2x-absolute-wf_vblank-interruptible.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-upscaling@pipe-a-valid-mode:
- shard-tglb: NOTRUN -> [SKIP][30] ([i915#2587] / [i915#2672])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][31] ([i915#2672]) +3 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-upscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][32] ([i915#2587] / [i915#2672])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb4/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][33] ([i915#2672] / [i915#3555])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-render:
- shard-tglb: NOTRUN -> [SKIP][34] ([fdo#109280] / [fdo#111825]) +5 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-cpu:
- shard-tglb: NOTRUN -> [SKIP][35] ([i915#6497])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-indfb-plflip-blt:
- shard-apl: NOTRUN -> [SKIP][36] ([fdo#109271]) +55 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@kms_frontbuffer_tracking@psr-2p-primscrn-indfb-plflip-blt.html
* igt@kms_plane_scaling@2x-scaler-multi-pipe:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#109274] / [fdo#111825])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_plane_scaling@2x-scaler-multi-pipe.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#658])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-sf:
- shard-tglb: NOTRUN -> [SKIP][39] ([i915#2920])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_psr2_sf@overlay-plane-move-continuous-sf.html
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [PASS][40] -> [SKIP][41] ([fdo#109441]) +2 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@kms_psr@psr2_primary_blt.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@kms_psr@psr2_primary_blt.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- shard-tglb: [PASS][42] -> [SKIP][43] ([i915#5519])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-tglb3/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb3/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-apl: [PASS][44] -> [DMESG-WARN][45] ([i915#180]) +2 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl8/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl8/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
* igt@sysfs_clients@fair-7:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271] / [i915#2994])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl6/igt@sysfs_clients@fair-7.html
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-apl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl6/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl1/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_exec_balancer@parallel-balancer:
- shard-iclb: [SKIP][49] ([i915#4525]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb5/igt@gem_exec_balancer@parallel-balancer.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@gem_exec_balancer@parallel-balancer.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][51] ([i915#2842]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-glk3/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][53] ([i915#5566] / [i915#716]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-glk7/igt@gen9_exec_parse@allowed-all.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-glk7/igt@gen9_exec_parse@allowed-all.html
* igt@kms_cursor_crc@cursor-suspend@pipe-b-vga-1:
- shard-snb: [SKIP][55] ([fdo#109271]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-snb6/igt@kms_cursor_crc@cursor-suspend@pipe-b-vga-1.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-snb4/igt@kms_cursor_crc@cursor-suspend@pipe-b-vga-1.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [FAIL][57] ([i915#4767]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl6/igt@kms_fbcon_fbt@fbc-suspend.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling@pipe-a-default-mode:
- shard-iclb: [SKIP][59] ([i915#3555]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling@pipe-a-default-mode.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling@pipe-a-default-mode.html
* igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-5@pipe-b-edp-1:
- shard-iclb: [SKIP][61] ([i915#5176]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-5@pipe-b-edp-1.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-5@pipe-b-edp-1.html
* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-iclb: [SKIP][63] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb1/igt@kms_psr2_su@page_flip-xrgb8888.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@kms_psr2_su@page_flip-xrgb8888.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][65] ([fdo#109441]) -> [PASS][66] +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_rotation_crc@sprite-rotation-180:
- shard-tglb: [INCOMPLETE][67] -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-tglb8/igt@kms_rotation_crc@sprite-rotation-180.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-tglb5/igt@kms_rotation_crc@sprite-rotation-180.html
* igt@kms_vblank@pipe-c-accuracy-idle:
- shard-glk: [FAIL][69] ([i915#43]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-glk5/igt@kms_vblank@pipe-c-accuracy-idle.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-glk6/igt@kms_vblank@pipe-c-accuracy-idle.html
* igt@perf@polling-parameterized:
- shard-apl: [FAIL][71] ([i915#5639]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl6/igt@perf@polling-parameterized.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl1/igt@perf@polling-parameterized.html
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [FAIL][73] ([i915#6117]) -> [SKIP][74] ([i915#4525])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@gem_exec_balancer@parallel-ordering.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@gem_exec_balancer@parallel-ordering.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][75] ([i915#658]) -> [SKIP][76] ([i915#588])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb5/igt@i915_pm_dc@dc3co-vpb-simulation.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf:
- shard-iclb: [SKIP][77] ([i915#2920]) -> [SKIP][78] ([i915#658])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-sf.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-iclb: [SKIP][79] ([i915#2920]) -> [SKIP][80] ([fdo#111068] / [i915#658]) +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-iclb3/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
* igt@runner@aborted:
- shard-apl: ([FAIL][81], [FAIL][82], [FAIL][83], [FAIL][84]) ([i915#180] / [i915#3002] / [i915#4312]) -> ([FAIL][85], [FAIL][86], [FAIL][87], [FAIL][88], [FAIL][89], [FAIL][90]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl6/igt@runner@aborted.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl8/igt@runner@aborted.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl1/igt@runner@aborted.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12202/shard-apl1/igt@runner@aborted.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl2/igt@runner@aborted.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl8/igt@runner@aborted.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl3/igt@runner@aborted.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl3/igt@runner@aborted.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl1/igt@runner@aborted.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109303v1/shard-apl8/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#43]: https://gitlab.freedesktop.org/drm/intel/issues/43
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6537]: https://gitlab.freedesktop.org/drm/intel/issues/6537
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
Build changes
-------------
* Linux: CI_DRM_12202 -> Patchwork_109303v1
CI-20190529: 20190529
CI_DRM_12202: 0b9f0501c9541cf79fdfb43a7760360a81453d88 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6670: d618e9865fe5cbaf511ca43503abad442605d0a5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_109303v1: 0b9f0501c9541cf79fdfb43a7760360a81453d88 @ 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_109303v1/index.html
[-- Attachment #2: Type: text/html, Size: 28142 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-10-01 8:37 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-30 10:42 [Intel-gfx] [PATCH 0/5] drm/i915: Fix watermark calculations with various CCS modifiers Ville Syrjala
2022-09-30 10:42 ` [Intel-gfx] [PATCH 1/5] drm/i915: Fix watermark calculations for gen12+ " Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
2022-09-30 10:42 ` [Intel-gfx] [PATCH 2/5] drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier Ville Syrjala
2022-09-30 10:42 ` Ville Syrjala
2022-09-30 10:43 ` [Intel-gfx] [PATCH 3/5] drm/i915: Fix watermark calculations for DG2 CCS modifiers Ville Syrjala
2022-09-30 10:43 ` Ville Syrjala
2022-09-30 10:43 ` [Intel-gfx] [PATCH 4/5] drm/i915: Fix watermark calculations for DG2 CCS+CC modifier Ville Syrjala
2022-09-30 10:43 ` Ville Syrjala
2022-09-30 10:43 ` [Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code Ville Syrjala
2022-09-30 11:22 ` Juha-Pekka Heikkila
2022-09-30 11:31 ` Ville Syrjälä
2022-09-30 11:47 ` Juha-Pekka Heikkila
2022-09-30 12:13 ` Ville Syrjälä
2022-09-30 11:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix watermark calculations with various CCS modifiers Patchwork
2022-10-01 8:37 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.