* [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff
@ 2021-10-06 23:57 Ville Syrjala
2021-10-06 23:57 ` [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation Ville Syrjala
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Ville Syrjala @ 2021-10-06 23:57 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
I was just perusing skl_program_plane() when I stumbled on
this slightly iffy pxp stuff. Let's try to clean it up.
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Juston Li <juston.li@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Ville Syrjälä (4):
drm/i915: Move the pxp plane state computation
drm/i915: Fix up skl_program_plane() pxp stuff
drm/i915: Remove the drm_dbg() from the vblank evade critical section
drm/i915: Rename intel_load_plane_csc_black()
drivers/gpu/drm/i915/display/intel_display.c | 31 +------
.../drm/i915/display/skl_universal_plane.c | 80 +++++++++++--------
2 files changed, 46 insertions(+), 65 deletions(-)
--
2.32.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
@ 2021-10-06 23:57 ` Ville Syrjala
2021-10-07 5:52 ` Li, Juston
2021-10-06 23:57 ` [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff Ville Syrjala
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Ville Syrjala @ 2021-10-06 23:57 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
No real reason to have this pxp state computation in
intel_atomic_check_planes(). Just stuff it into skl_plane_check().
There was also some funny state copying being done from the
old plane state to the new plane state when the plane is anyway
disabled.
The one thing we presumably must remember to do is copy
over the decrypt state when assigning a Y plane for planar
YCbCr scanout, so that the Y plane's PLANE_SURF will get the
appropriate bit set. The force_black thing should not matter
as I'm pretty sure all that stuff is ignored for the Y plane.
I suppose this was the reason for the odd placement for the
state computation, but I see no reason to deviate from the
standard way of doing these things. This also guarantees
that we don't calculate things differently between the
linked UV and Y plane.
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Juston Li <juston.li@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 31 +------------------
.../drm/i915/display/skl_universal_plane.c | 15 +++++++++
2 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 4f0badb11bbb..bb45872cb619 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -71,8 +71,6 @@
#include "gt/intel_rps.h"
#include "gt/gen8_ppgtt.h"
-#include "pxp/intel_pxp.h"
-
#include "g4x_dp.h"
#include "g4x_hdmi.h"
#include "i915_drv.h"
@@ -6662,6 +6660,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
linked_state->ctl = plane_state->ctl | PLANE_CTL_YUV420_Y_PLANE;
linked_state->color_ctl = plane_state->color_ctl;
linked_state->view = plane_state->view;
+ linked_state->decrypt = plane_state->decrypt;
intel_plane_copy_hw_state(linked_state, plane_state);
linked_state->uapi.src = plane_state->uapi.src;
@@ -9024,28 +9023,13 @@ static int intel_bigjoiner_add_affected_planes(struct intel_atomic_state *state)
return 0;
}
-static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
-{
- struct drm_i915_private *i915 = to_i915(obj->base.dev);
-
- return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
-}
-
-static bool pxp_is_borked(struct drm_i915_gem_object *obj)
-{
- return i915_gem_object_is_protected(obj) && !bo_has_valid_encryption(obj);
-}
-
static int intel_atomic_check_planes(struct intel_atomic_state *state)
{
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
struct intel_plane_state *plane_state;
struct intel_plane *plane;
- struct intel_plane_state *new_plane_state;
- struct intel_plane_state *old_plane_state;
struct intel_crtc *crtc;
- const struct drm_framebuffer *fb;
int i, ret;
ret = icl_add_linked_planes(state);
@@ -9093,19 +9077,6 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
return ret;
}
- for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
- new_plane_state = intel_atomic_get_new_plane_state(state, plane);
- old_plane_state = intel_atomic_get_old_plane_state(state, plane);
- fb = new_plane_state->hw.fb;
- if (fb) {
- new_plane_state->decrypt = bo_has_valid_encryption(intel_fb_obj(fb));
- new_plane_state->force_black = pxp_is_borked(intel_fb_obj(fb));
- } else {
- new_plane_state->decrypt = old_plane_state->decrypt;
- new_plane_state->force_black = old_plane_state->force_black;
- }
- }
-
return 0;
}
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index a0e53a3b267a..1fcb41942c7e 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1737,6 +1737,18 @@ static bool skl_fb_scalable(const struct drm_framebuffer *fb)
}
}
+static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
+{
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+
+ return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
+}
+
+static bool pxp_is_borked(struct drm_i915_gem_object *obj)
+{
+ return i915_gem_object_is_protected(obj) && !bo_has_valid_encryption(obj);
+}
+
static int skl_plane_check(struct intel_crtc_state *crtc_state,
struct intel_plane_state *plane_state)
{
@@ -1781,6 +1793,9 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
if (ret)
return ret;
+ plane_state->decrypt = bo_has_valid_encryption(intel_fb_obj(fb));
+ plane_state->force_black = pxp_is_borked(intel_fb_obj(fb));
+
/* HW only has 8 bits pixel precision, disable plane if invisible */
if (!(plane_state->hw.alpha >> 8))
plane_state->uapi.visible = false;
--
2.32.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
2021-10-06 23:57 ` [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation Ville Syrjala
@ 2021-10-06 23:57 ` Ville Syrjala
2021-10-07 18:36 ` Rodrigo Vivi
2021-10-06 23:57 ` [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section Ville Syrjala
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Ville Syrjala @ 2021-10-06 23:57 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
There's lots of expensive stuff inserted between the PLANE_CTL
and PLANE_SURF writes even though the comment before the PLANE_CTL
write says not to put stuff there. Move it all to a more apporiate
place.
There's also a weird PLANE_COLOR_CTL RMW in there. I guess because
force_black was computed way too late originally, but that is now
sorted.
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Juston Li <juston.li@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
.../drm/i915/display/skl_universal_plane.c | 30 +++++++++----------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 1fcb41942c7e..55dae8c8fcad 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -985,6 +985,9 @@ static u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
}
+ if (plane_state->force_black)
+ plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
+
return plane_color_ctl;
}
@@ -1090,8 +1093,19 @@ skl_program_plane(struct intel_plane *plane,
aux_dist |= skl_plane_stride(plane_state, aux_plane);
}
+ plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
+ if (plane_state->decrypt)
+ plane_surf |= PLANE_SURF_DECRYPT;
+
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
+ /*
+ * FIXME: pxp session invalidation can hit any time even at time of commit
+ * or after the commit, display content will be garbage.
+ */
+ if (plane_state->force_black)
+ intel_load_plane_csc_black(plane);
+
intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
(crtc_y << 16) | crtc_x);
@@ -1146,22 +1160,6 @@ skl_program_plane(struct intel_plane *plane,
* the control register just before the surface register.
*/
intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
- plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
- plane_color_ctl = intel_de_read_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id));
-
- /*
- * FIXME: pxp session invalidation can hit any time even at time of commit
- * or after the commit, display content will be garbage.
- */
- if (plane_state->decrypt) {
- plane_surf |= PLANE_SURF_DECRYPT;
- } else if (plane_state->force_black) {
- intel_load_plane_csc_black(plane);
- plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
- }
-
- intel_de_write_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id),
- plane_color_ctl);
intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), plane_surf);
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
--
2.32.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
2021-10-06 23:57 ` [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation Ville Syrjala
2021-10-06 23:57 ` [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff Ville Syrjala
@ 2021-10-06 23:57 ` Ville Syrjala
2021-10-07 5:54 ` Li, Juston
2021-10-06 23:57 ` [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black() Ville Syrjala
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Ville Syrjala @ 2021-10-06 23:57 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We are inside the vblank evade critical section here, racing
against the raster beam. There is no time to print debug
messages.
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Juston Li <juston.li@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 55dae8c8fcad..1e85ea98231f 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1018,8 +1018,6 @@ static void intel_load_plane_csc_black(struct intel_plane *intel_plane)
enum plane_id plane = intel_plane->id;
u16 postoff = 0;
- drm_dbg_kms(&dev_priv->drm, "plane color CTM to black %s:%d\n",
- intel_plane->base.name, plane);
intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 0), 0);
intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 1), 0);
--
2.32.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black()
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
` (2 preceding siblings ...)
2021-10-06 23:57 ` [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section Ville Syrjala
@ 2021-10-06 23:57 ` Ville Syrjala
2021-10-07 5:55 ` Li, Juston
2021-10-07 7:14 ` Ville Syrjälä
2021-10-07 1:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Clean up the pxp stuff Patchwork
` (2 subsequent siblings)
6 siblings, 2 replies; 14+ messages in thread
From: Ville Syrjala @ 2021-10-06 23:57 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
intel_load_plane_csc_black() is specific to glk+ so deserves
a name reflecting that fact. Also rename the variables to
standard form so I won't get confused reading the code.
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Juston Li <juston.li@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
.../drm/i915/display/skl_universal_plane.c | 35 +++++++++----------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 1e85ea98231f..709ab7166d88 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1011,29 +1011,28 @@ static u32 skl_surf_address(const struct intel_plane_state *plane_state,
}
}
-static void intel_load_plane_csc_black(struct intel_plane *intel_plane)
+static void glk_plane_csc_load_black(struct intel_plane *plane)
{
- struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
- enum pipe pipe = intel_plane->pipe;
- enum plane_id plane = intel_plane->id;
- u16 postoff = 0;
+ struct drm_i915_private *i915 = to_i915(plane->base.dev);
+ enum plane_id plane_id = plane->id;
+ enum pipe pipe = plane->pipe;
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 0), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 1), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 0), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 1), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 2), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 3), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 2), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 3), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 4), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 5), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 4), 0);
+ intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 5), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 0), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 1), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 2), 0);
+ intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 0), 0);
+ intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 1), 0);
+ intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 2), 0);
- intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 0), postoff);
- intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 1), postoff);
- intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 2), postoff);
+ intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 0), 0);
+ intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 1), 0);
+ intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 2), 0);
}
static void
@@ -1102,7 +1101,7 @@ skl_program_plane(struct intel_plane *plane,
* or after the commit, display content will be garbage.
*/
if (plane_state->force_black)
- intel_load_plane_csc_black(plane);
+ glk_plane_csc_load_black(plane);
intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
--
2.32.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Clean up the pxp stuff
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
` (3 preceding siblings ...)
2021-10-06 23:57 ` [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black() Ville Syrjala
@ 2021-10-07 1:26 ` Patchwork
2021-10-07 3:53 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-10-07 5:59 ` [Intel-gfx] [PATCH 0/4] " Li, Juston
6 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2021-10-07 1:26 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5872 bytes --]
== Series Details ==
Series: drm/i915: Clean up the pxp stuff
URL : https://patchwork.freedesktop.org/series/95538/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10691 -> Patchwork_21272
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/index.html
Known issues
------------
Here are the changes found in Patchwork_21272 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +10 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-kbl-soraka/igt@amdgpu/amd_basic@cs-gfx.html
* igt@amdgpu/amd_basic@semaphore:
- fi-bsw-nick: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-bsw-nick/igt@amdgpu/amd_basic@semaphore.html
- fi-bdw-5557u: NOTRUN -> [SKIP][3] ([fdo#109271]) +27 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-bdw-5557u/igt@amdgpu/amd_basic@semaphore.html
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][4] ([i915#3718])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-bdw-5557u/igt@core_hotunplug@unbind-rebind.html
* igt@kms_chamelium@dp-crc-fast:
- fi-skl-guc: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-skl-guc/igt@kms_chamelium@dp-crc-fast.html
- fi-bdw-5557u: NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-bdw-5557u/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-skl-guc: NOTRUN -> [SKIP][7] ([fdo#109271]) +28 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-skl-guc/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_flip@basic-flip-vs-modeset@c-dp1:
- fi-cfl-8109u: [PASS][8] -> [FAIL][9] ([i915#4165]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-modeset@c-dp1.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-modeset@c-dp1.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: [PASS][10] -> [DMESG-WARN][11] ([i915#295]) +18 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-skl-guc: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#533])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-skl-guc/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-kbl-soraka: [DMESG-WARN][13] ([i915#1982] / [i915#262]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/fi-kbl-soraka/igt@debugfs_test@read_all_entries.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-kbl-soraka/igt@debugfs_test@read_all_entries.html
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][15] ([i915#2940]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-bsw-nick/igt@i915_selftest@live@execlists.html
#### Warnings ####
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [FAIL][17] -> [SKIP][18] ([fdo#109271])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/fi-kbl-guc/igt@i915_pm_rpm@basic-rte.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3718]: https://gitlab.freedesktop.org/drm/intel/issues/3718
[i915#4165]: https://gitlab.freedesktop.org/drm/intel/issues/4165
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Participating hosts (43 -> 38)
------------------------------
Additional (1): fi-skl-guc
Missing (6): fi-ilk-m540 bat-dg1-6 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 bat-jsl-1
Build changes
-------------
* Linux: CI_DRM_10691 -> Patchwork_21272
CI-20190529: 20190529
CI_DRM_10691: eb389599ad96f44ed6fe1770c4dbaa2e88bfa5bc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6235: 65dd7d484d5d09de196def254afebf41dfde1052 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21272: aaa29673708c94fe4a6aa8ab46acfbb407d3e2de @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
aaa29673708c drm/i915: Rename intel_load_plane_csc_black()
dd77ce589d1c drm/i915: Remove the drm_dbg() from the vblank evade critical section
dc1faec5e487 drm/i915: Fix up skl_program_plane() pxp stuff
7afa96c1bb5e drm/i915: Move the pxp plane state computation
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/index.html
[-- Attachment #2: Type: text/html, Size: 7335 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Clean up the pxp stuff
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
` (4 preceding siblings ...)
2021-10-07 1:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Clean up the pxp stuff Patchwork
@ 2021-10-07 3:53 ` Patchwork
2021-10-07 5:59 ` [Intel-gfx] [PATCH 0/4] " Li, Juston
6 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2021-10-07 3:53 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30255 bytes --]
== Series Details ==
Series: drm/i915: Clean up the pxp stuff
URL : https://patchwork.freedesktop.org/series/95538/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10691_full -> Patchwork_21272_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21272_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21272_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21272_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl8/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_frontbuffer_tracking@psr-1p-pri-indfb-multidraw:
- shard-tglb: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb7/igt@kms_frontbuffer_tracking@psr-1p-pri-indfb-multidraw.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb6/igt@kms_frontbuffer_tracking@psr-1p-pri-indfb-multidraw.html
Known issues
------------
Here are the changes found in Patchwork_21272_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-massive:
- shard-apl: NOTRUN -> [DMESG-WARN][4] ([i915#3002])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl7/igt@gem_create@create-massive.html
* igt@gem_ctx_persistence@engines-persistence:
- shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#1099]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-snb7/igt@gem_ctx_persistence@engines-persistence.html
* igt@gem_eio@unwedge-stress:
- shard-iclb: [PASS][6] -> [TIMEOUT][7] ([i915#2369] / [i915#2481] / [i915#3070])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb2/igt@gem_eio@unwedge-stress.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb8/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-deadline:
- shard-kbl: NOTRUN -> [FAIL][8] ([i915#2846])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@gem_exec_fair@basic-deadline.html
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2846])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk3/igt@gem_exec_fair@basic-deadline.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk7/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][11] ([fdo#109271]) +114 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: [PASS][12] -> [FAIL][13] ([i915#2842]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk6/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][14] -> [FAIL][15] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb6/igt@gem_exec_fair@basic-none-share@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb6/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none@rcs0:
- shard-kbl: [PASS][16] -> [FAIL][17] ([i915#2842])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl1/igt@gem_exec_fair@basic-none@rcs0.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl4/igt@gem_exec_fair@basic-none@rcs0.html
* igt@gem_huc_copy@huc-copy:
- shard-apl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#2190])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl1/igt@gem_huc_copy@huc-copy.html
- shard-skl: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#2190])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@gem_huc_copy@huc-copy.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#3323])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl1/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][21] -> [DMESG-WARN][22] ([i915#1436] / [i915#716])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk7/igt@gen9_exec_parse@allowed-all.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk3/igt@gen9_exec_parse@allowed-all.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-skl: NOTRUN -> [DMESG-WARN][23] ([i915#1982])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_rc6_residency@media-rc6-accuracy:
- shard-tglb: NOTRUN -> [SKIP][24] ([fdo#109289] / [fdo#111719])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb5/igt@i915_pm_rc6_residency@media-rc6-accuracy.html
* igt@i915_selftest@live@hangcheck:
- shard-snb: [PASS][25] -> [INCOMPLETE][26] ([i915#3921])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-snb7/igt@i915_selftest@live@hangcheck.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-snb6/igt@i915_selftest@live@hangcheck.html
* igt@kms_big_fb@linear-16bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#111614]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb3/igt@kms_big_fb@linear-16bpp-rotate-270.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-skl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3777]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-kbl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#3777])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3777]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][31] ([i915#3722]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111615])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb5/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][33] ([i915#3689]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_ccs.html
* igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#3886]) +4 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl3/igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#3886]) +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3886]) +10 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl6/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@hdmi-hpd-storm-disable:
- shard-kbl: NOTRUN -> [SKIP][37] ([fdo#109271] / [fdo#111827]) +6 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_chamelium@hdmi-hpd-storm-disable.html
* igt@kms_chamelium@hdmi-mode-timings:
- shard-snb: NOTRUN -> [SKIP][38] ([fdo#109271] / [fdo#111827]) +21 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-snb5/igt@kms_chamelium@hdmi-mode-timings.html
* igt@kms_color_chamelium@pipe-a-ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +26 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_color_chamelium@pipe-a-ctm-limited-range.html
* igt@kms_color_chamelium@pipe-b-ctm-0-5:
- shard-tglb: NOTRUN -> [SKIP][40] ([fdo#109284] / [fdo#111827]) +5 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@kms_color_chamelium@pipe-b-ctm-0-5.html
* igt@kms_color_chamelium@pipe-b-ctm-max:
- shard-skl: NOTRUN -> [SKIP][41] ([fdo#109271] / [fdo#111827]) +11 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_color_chamelium@pipe-b-ctm-max.html
* igt@kms_concurrent@pipe-d:
- shard-tglb: NOTRUN -> [FAIL][42] ([i915#1385])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@kms_concurrent@pipe-d.html
* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> [TIMEOUT][43] ([i915#1319]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_content_protection@atomic-dpms.html
* igt@kms_content_protection@legacy:
- shard-tglb: NOTRUN -> [SKIP][44] ([fdo#111828])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb3/igt@kms_content_protection@legacy.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-tglb: [PASS][45] -> [INCOMPLETE][46] ([i915#2828] / [i915#456])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb3/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_cursor_crc@pipe-b-cursor-32x32-offscreen:
- shard-tglb: NOTRUN -> [SKIP][47] ([i915#3319]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb3/igt@kms_cursor_crc@pipe-b-cursor-32x32-offscreen.html
* igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen:
- shard-kbl: NOTRUN -> [SKIP][48] ([fdo#109271]) +63 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen.html
* igt@kms_cursor_crc@pipe-c-cursor-32x10-rapid-movement:
- shard-tglb: NOTRUN -> [SKIP][49] ([i915#3359]) +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@kms_cursor_crc@pipe-c-cursor-32x10-rapid-movement.html
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-tglb: [PASS][50] -> [INCOMPLETE][51] ([i915#4211])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb7/igt@kms_cursor_crc@pipe-d-cursor-suspend.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][52] -> [INCOMPLETE][53] ([i915#155] / [i915#180] / [i915#636])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl4/igt@kms_fbcon_fbt@fbc-suspend.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@2x-flip-vs-rmfb:
- shard-tglb: NOTRUN -> [SKIP][54] ([fdo#111825]) +16 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@kms_flip@2x-flip-vs-rmfb.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2:
- shard-glk: [PASS][55] -> [FAIL][56] ([i915#79]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk6/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
* igt@kms_flip@modeset-vs-vblank-race-interruptible@a-dp1:
- shard-apl: NOTRUN -> [DMESG-WARN][57] ([i915#1982])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl3/igt@kms_flip@modeset-vs-vblank-race-interruptible@a-dp1.html
* igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1:
- shard-skl: [PASS][58] -> [FAIL][59] ([i915#2122])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl8/igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-snb: NOTRUN -> [SKIP][60] ([fdo#109271]) +446 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-snb5/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html
- shard-iclb: [PASS][61] -> [SKIP][62] ([i915#3701])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb7/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-apl: NOTRUN -> [SKIP][63] ([fdo#109271] / [i915#2672])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][64] -> [DMESG-WARN][65] ([i915#180]) +4 similar issues
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-suspend.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-suspend.html
- shard-tglb: [PASS][66] -> [INCOMPLETE][67] ([i915#456]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-suspend.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-suspend.html
- shard-snb: [PASS][68] -> [DMESG-WARN][69] ([i915#3305])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-snb2/igt@kms_frontbuffer_tracking@fbc-suspend.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-snb2/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt:
- shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271]) +287 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt.html
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#533])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_pipe_crc_basic@hang-read-crc-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][72] ([fdo#108145] / [i915#265]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][73] ([i915#265]) +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-kbl: NOTRUN -> [FAIL][74] ([fdo#108145] / [i915#265])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][75] ([fdo#108145] / [i915#265]) +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
- shard-kbl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#658])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#658]) +5 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl6/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-skl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#658]) +2 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_psr2_sf@plane-move-sf-dmg-area-2.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][79] -> [SKIP][80] ([fdo#109441]) +2 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb8/igt@kms_psr@psr2_cursor_render.html
* igt@kms_sequence@queue-busy:
- shard-skl: [PASS][81] -> [DMESG-WARN][82] ([i915#1982]) +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl4/igt@kms_sequence@queue-busy.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl1/igt@kms_sequence@queue-busy.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-apl: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#533]) +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_vblank@pipe-d-wait-idle.html
* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#2437])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl2/igt@kms_writeback@writeback-check-output.html
* igt@perf@polling-parameterized:
- shard-skl: [PASS][85] -> [FAIL][86] ([i915#1542])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl6/igt@perf@polling-parameterized.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@perf@polling-parameterized.html
* igt@prime_nv_pcopy@test2:
- shard-tglb: NOTRUN -> [SKIP][87] ([fdo#109291])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb8/igt@prime_nv_pcopy@test2.html
* igt@prime_vgem@fence-read-hang:
- shard-tglb: NOTRUN -> [SKIP][88] ([fdo#109295])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb3/igt@prime_vgem@fence-read-hang.html
* igt@sysfs_clients@fair-1:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#2994]) +3 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl6/igt@sysfs_clients@fair-1.html
* igt@sysfs_clients@pidname:
- shard-kbl: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#2994])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@sysfs_clients@pidname.html
* igt@sysfs_clients@sema-10:
- shard-skl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#2994]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl3/igt@sysfs_clients@sema-10.html
#### Possible fixes ####
* igt@feature_discovery@psr2:
- shard-iclb: [SKIP][92] ([i915#658]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb7/igt@feature_discovery@psr2.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb2/igt@feature_discovery@psr2.html
* igt@gem_ctx_persistence@many-contexts:
- shard-tglb: [FAIL][94] ([i915#2410]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb1/igt@gem_ctx_persistence@many-contexts.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb5/igt@gem_ctx_persistence@many-contexts.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-tglb: [FAIL][96] ([i915#2842]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb1/igt@gem_exec_fair@basic-pace@vcs1.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb7/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_workarounds@suspend-resume:
- shard-tglb: [INCOMPLETE][98] ([i915#456]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-tglb7/igt@gem_workarounds@suspend-resume.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-tglb3/igt@gem_workarounds@suspend-resume.html
* igt@i915_suspend@forcewake:
- shard-kbl: [DMESG-WARN][100] ([i915#180]) -> [PASS][101] +1 similar issue
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl7/igt@i915_suspend@forcewake.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl3/igt@i915_suspend@forcewake.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [FAIL][102] ([i915#2521]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl8/igt@kms_async_flips@alternate-sync-async-flip.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl4/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [FAIL][104] ([i915#72]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk3/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk7/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_flip@2x-plain-flip-ts-check-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][106] ([i915#2122]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk7/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ab-hdmi-a1-hdmi-a2.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk3/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ab-hdmi-a1-hdmi-a2.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2:
- shard-glk: [FAIL][108] ([i915#79]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk6/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a2.html
* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-apl: [DMESG-WARN][110] ([i915#180]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html
* igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1:
- shard-skl: [FAIL][112] ([i915#2122]) -> [PASS][113] +1 similar issue
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl8/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible@a-edp1.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile:
- shard-iclb: [SKIP][114] ([i915#3701]) -> [PASS][115] +1 similar issue
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb8/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile.html
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][116] ([fdo#109441]) -> [PASS][117] +1 similar issue
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb7/igt@kms_psr@psr2_suspend.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][118] ([i915#198]) -> [PASS][119] +1 similar issue
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-skl5/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-skl2/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
* igt@perf@polling-parameterized:
- shard-glk: [FAIL][120] ([i915#1542]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-glk7/igt@perf@polling-parameterized.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-glk3/igt@perf@polling-parameterized.html
#### Warnings ####
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [DMESG-WARN][122] ([i915#180]) -> [INCOMPLETE][123] ([i915#155])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl7/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][124] ([i915#2920]) -> [SKIP][125] ([i915#658]) +1 similar issue
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb8/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][126] ([i915#658]) -> [SKIP][127] ([i915#2920]) +1 similar issue
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-iclb5/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#92])
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl2/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl6/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl7/igt@runner@aborted.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl6/igt@runner@aborted.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl6/igt@runner@aborted.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-kbl7/igt@runner@aborted.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl7/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl6/igt@runner@aborted.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl7/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl6/igt@runner@aborted.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl6/igt@runner@aborted.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl7/igt@runner@aborted.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-kbl7/igt@runner@aborted.html
- shard-apl: ([FAIL][141], [FAIL][142]) ([i915#180] / [i915#3002] / [i915#3363]) -> ([FAIL][143], [FAIL][144]) ([i915#3002] / [i915#3363])
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-apl8/igt@runner@aborted.html
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10691/shard-apl2/igt@runner@aborted.html
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl6/igt@runner@aborted.html
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/shard-apl7/igt@runn
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21272/index.html
[-- Attachment #2: Type: text/html, Size: 33879 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation
2021-10-06 23:57 ` [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation Ville Syrjala
@ 2021-10-07 5:52 ` Li, Juston
2021-10-07 6:41 ` Ville Syrjälä
0 siblings, 1 reply; 14+ messages in thread
From: Li, Juston @ 2021-10-07 5:52 UTC (permalink / raw)
To: ville.syrjala, intel-gfx
Cc: Shankar, Uma, Vivi, Rodrigo, Gupta, Anshuman, Ceraolo Spurio, Daniele
On Thu, 2021-10-07 at 02:57 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> No real reason to have this pxp state computation in
> intel_atomic_check_planes(). Just stuff it into skl_plane_check().
>
> There was also some funny state copying being done from the
> old plane state to the new plane state when the plane is anyway
> disabled.
>
> The one thing we presumably must remember to do is copy
> over the decrypt state when assigning a Y plane for planar
> YCbCr scanout, so that the Y plane's PLANE_SURF will get the
> appropriate bit set. The force_black thing should not matter
> as I'm pretty sure all that stuff is ignored for the Y plane.
> I suppose this was the reason for the odd placement for the
> state computation, but I see no reason to deviate from the
> standard way of doing these things. This also guarantees
> that we don't calculate things differently between the
> linked UV and Y plane.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 31 +----------------
> --
> .../drm/i915/display/skl_universal_plane.c | 15 +++++++++
> 2 files changed, 16 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 4f0badb11bbb..bb45872cb619 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -71,8 +71,6 @@
> #include "gt/intel_rps.h"
> #include "gt/gen8_ppgtt.h"
>
> -#include "pxp/intel_pxp.h"
> -
> #include "g4x_dp.h"
> #include "g4x_hdmi.h"
> #include "i915_drv.h"
> @@ -6662,6 +6660,7 @@ static int icl_check_nv12_planes(struct
> intel_crtc_state *crtc_state)
> linked_state->ctl = plane_state->ctl |
> PLANE_CTL_YUV420_Y_PLANE;
> linked_state->color_ctl = plane_state->color_ctl;
> linked_state->view = plane_state->view;
> + linked_state->decrypt = plane_state->decrypt;
Ahh this was what we were missing before.
The computation was originally in skl_plane_check() but to get it
working I moved it to intel_atomic_check_planes() after
icl_check_nv12_planes() so that it would set that plane's decrypt flag
as well, not knowing I could just do this.
Reviewed-by: Juston Li <juston.li@intel.com>
> intel_plane_copy_hw_state(linked_state, plane_state);
> linked_state->uapi.src = plane_state->uapi.src;
> @@ -9024,28 +9023,13 @@ static int
> intel_bigjoiner_add_affected_planes(struct intel_atomic_state *state)
> return 0;
> }
>
> -static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
> -{
> - struct drm_i915_private *i915 = to_i915(obj->base.dev);
> -
> - return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
> -}
> -
> -static bool pxp_is_borked(struct drm_i915_gem_object *obj)
> -{
> - return i915_gem_object_is_protected(obj) &&
> !bo_has_valid_encryption(obj);
> -}
> -
> static int intel_atomic_check_planes(struct intel_atomic_state *state)
> {
> struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> struct intel_crtc_state *old_crtc_state, *new_crtc_state;
> struct intel_plane_state *plane_state;
> struct intel_plane *plane;
> - struct intel_plane_state *new_plane_state;
> - struct intel_plane_state *old_plane_state;
> struct intel_crtc *crtc;
> - const struct drm_framebuffer *fb;
> int i, ret;
>
> ret = icl_add_linked_planes(state);
> @@ -9093,19 +9077,6 @@ static int intel_atomic_check_planes(struct
> intel_atomic_state *state)
> return ret;
> }
>
> - for_each_new_intel_plane_in_state(state, plane, plane_state, i)
> {
> - new_plane_state =
> intel_atomic_get_new_plane_state(state, plane);
> - old_plane_state =
> intel_atomic_get_old_plane_state(state, plane);
> - fb = new_plane_state->hw.fb;
> - if (fb) {
> - new_plane_state->decrypt =
> bo_has_valid_encryption(intel_fb_obj(fb));
> - new_plane_state->force_black =
> pxp_is_borked(intel_fb_obj(fb));
> - } else {
> - new_plane_state->decrypt = old_plane_state-
> >decrypt;
> - new_plane_state->force_black = old_plane_state-
> >force_black;
> - }
> - }
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index a0e53a3b267a..1fcb41942c7e 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -1737,6 +1737,18 @@ static bool skl_fb_scalable(const struct
> drm_framebuffer *fb)
> }
> }
>
> +static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
> +{
> + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> +
> + return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
> +}
> +
> +static bool pxp_is_borked(struct drm_i915_gem_object *obj)
> +{
> + return i915_gem_object_is_protected(obj) &&
> !bo_has_valid_encryption(obj);
> +}
> +
> static int skl_plane_check(struct intel_crtc_state *crtc_state,
> struct intel_plane_state *plane_state)
> {
> @@ -1781,6 +1793,9 @@ static int skl_plane_check(struct
> intel_crtc_state *crtc_state,
> if (ret)
> return ret;
>
> + plane_state->decrypt =
> bo_has_valid_encryption(intel_fb_obj(fb));
> + plane_state->force_black = pxp_is_borked(intel_fb_obj(fb));
> +
> /* HW only has 8 bits pixel precision, disable plane if
> invisible */
> if (!(plane_state->hw.alpha >> 8))
> plane_state->uapi.visible = false;
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section
2021-10-06 23:57 ` [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section Ville Syrjala
@ 2021-10-07 5:54 ` Li, Juston
0 siblings, 0 replies; 14+ messages in thread
From: Li, Juston @ 2021-10-07 5:54 UTC (permalink / raw)
To: ville.syrjala, intel-gfx
Cc: Shankar, Uma, Vivi, Rodrigo, Gupta, Anshuman, Ceraolo Spurio, Daniele
On Thu, 2021-10-07 at 02:57 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We are inside the vblank evade critical section here, racing
> against the raster beam. There is no time to print debug
> messages.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Juston Li <juston.li@intel.com>
> ---
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 55dae8c8fcad..1e85ea98231f 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -1018,8 +1018,6 @@ static void intel_load_plane_csc_black(struct
> intel_plane *intel_plane)
> enum plane_id plane = intel_plane->id;
> u16 postoff = 0;
>
> - drm_dbg_kms(&dev_priv->drm, "plane color CTM to black
> %s:%d\n",
> - intel_plane->base.name, plane);
> intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 0),
> 0);
> intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 1),
> 0);
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black()
2021-10-06 23:57 ` [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black() Ville Syrjala
@ 2021-10-07 5:55 ` Li, Juston
2021-10-07 7:14 ` Ville Syrjälä
1 sibling, 0 replies; 14+ messages in thread
From: Li, Juston @ 2021-10-07 5:55 UTC (permalink / raw)
To: ville.syrjala, intel-gfx
Cc: Shankar, Uma, Vivi, Rodrigo, Gupta, Anshuman, Ceraolo Spurio, Daniele
On Thu, 2021-10-07 at 02:57 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> intel_load_plane_csc_black() is specific to glk+ so deserves
> a name reflecting that fact. Also rename the variables to
> standard form so I won't get confused reading the code.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Juston Li <juston.li@intel.com>
> ---
> .../drm/i915/display/skl_universal_plane.c | 35 +++++++++----------
> 1 file changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 1e85ea98231f..709ab7166d88 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -1011,29 +1011,28 @@ static u32 skl_surf_address(const struct
> intel_plane_state *plane_state,
> }
> }
>
> -static void intel_load_plane_csc_black(struct intel_plane
> *intel_plane)
> +static void glk_plane_csc_load_black(struct intel_plane *plane)
> {
> - struct drm_i915_private *dev_priv = to_i915(intel_plane-
> >base.dev);
> - enum pipe pipe = intel_plane->pipe;
> - enum plane_id plane = intel_plane->id;
> - u16 postoff = 0;
> + struct drm_i915_private *i915 = to_i915(plane->base.dev);
> + enum plane_id plane_id = plane->id;
> + enum pipe pipe = plane->pipe;
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 0),
> 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 1),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 0), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 1), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 2),
> 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 3),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 2), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 3), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 4),
> 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 5),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 4), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 5), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 0),
> 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 1),
> 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 2),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 0),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 1),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 2),
> 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 0),
> postoff);
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 1),
> postoff);
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 2),
> postoff);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 0),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 1),
> 0);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 2),
> 0);
> }
>
> static void
> @@ -1102,7 +1101,7 @@ skl_program_plane(struct intel_plane *plane,
> * or after the commit, display content will be garbage.
> */
> if (plane_state->force_black)
> - intel_load_plane_csc_black(plane);
> + glk_plane_csc_load_black(plane);
>
> intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id),
> stride);
> intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
` (5 preceding siblings ...)
2021-10-07 3:53 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2021-10-07 5:59 ` Li, Juston
6 siblings, 0 replies; 14+ messages in thread
From: Li, Juston @ 2021-10-07 5:59 UTC (permalink / raw)
To: ville.syrjala, intel-gfx
Cc: Shankar, Uma, Vivi, Rodrigo, Gupta, Anshuman, Ceraolo Spurio, Daniele
On Thu, 2021-10-07 at 02:57 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> I was just perusing skl_program_plane() when I stumbled on
> this slightly iffy pxp stuff. Let's try to clean it up.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
I've verifed this patchset on CrOS with TGL.
Appreciate the clean up :)
> Ville Syrjälä (4):
> drm/i915: Move the pxp plane state computation
> drm/i915: Fix up skl_program_plane() pxp stuff
> drm/i915: Remove the drm_dbg() from the vblank evade critical
> section
> drm/i915: Rename intel_load_plane_csc_black()
>
> drivers/gpu/drm/i915/display/intel_display.c | 31 +------
> .../drm/i915/display/skl_universal_plane.c | 80 +++++++++++------
> --
> 2 files changed, 46 insertions(+), 65 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation
2021-10-07 5:52 ` Li, Juston
@ 2021-10-07 6:41 ` Ville Syrjälä
0 siblings, 0 replies; 14+ messages in thread
From: Ville Syrjälä @ 2021-10-07 6:41 UTC (permalink / raw)
To: Li, Juston
Cc: intel-gfx, Shankar, Uma, Vivi, Rodrigo, Gupta, Anshuman,
Ceraolo Spurio, Daniele
On Thu, Oct 07, 2021 at 05:52:47AM +0000, Li, Juston wrote:
> On Thu, 2021-10-07 at 02:57 +0300, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > No real reason to have this pxp state computation in
> > intel_atomic_check_planes(). Just stuff it into skl_plane_check().
> >
> > There was also some funny state copying being done from the
> > old plane state to the new plane state when the plane is anyway
> > disabled.
> >
> > The one thing we presumably must remember to do is copy
> > over the decrypt state when assigning a Y plane for planar
> > YCbCr scanout, so that the Y plane's PLANE_SURF will get the
> > appropriate bit set. The force_black thing should not matter
> > as I'm pretty sure all that stuff is ignored for the Y plane.
Hmm. Might even want to just clear force_black explicitly since
then we won't waste time writing the plane CSC registers if the flag
was previously set when the Y plane was used as an independent plane.
> > I suppose this was the reason for the odd placement for the
> > state computation, but I see no reason to deviate from the
> > standard way of doing these things. This also guarantees
> > that we don't calculate things differently between the
> > linked UV and Y plane.
> >
> > Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> > Cc: Juston Li <juston.li@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Uma Shankar <uma.shankar@intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_display.c | 31 +----------------
> > --
> > .../drm/i915/display/skl_universal_plane.c | 15 +++++++++
> > 2 files changed, 16 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 4f0badb11bbb..bb45872cb619 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -71,8 +71,6 @@
> > #include "gt/intel_rps.h"
> > #include "gt/gen8_ppgtt.h"
> >
> > -#include "pxp/intel_pxp.h"
> > -
> > #include "g4x_dp.h"
> > #include "g4x_hdmi.h"
> > #include "i915_drv.h"
> > @@ -6662,6 +6660,7 @@ static int icl_check_nv12_planes(struct
> > intel_crtc_state *crtc_state)
> > linked_state->ctl = plane_state->ctl |
> > PLANE_CTL_YUV420_Y_PLANE;
> > linked_state->color_ctl = plane_state->color_ctl;
> > linked_state->view = plane_state->view;
> > + linked_state->decrypt = plane_state->decrypt;
>
> Ahh this was what we were missing before.
>
> The computation was originally in skl_plane_check() but to get it
> working I moved it to intel_atomic_check_planes() after
> icl_check_nv12_planes() so that it would set that plane's decrypt flag
> as well, not knowing I could just do this.
Right. Figured that was probably the reason.
>
> Reviewed-by: Juston Li <juston.li@intel.com>
Ta.
>
> > intel_plane_copy_hw_state(linked_state, plane_state);
> > linked_state->uapi.src = plane_state->uapi.src;
> > @@ -9024,28 +9023,13 @@ static int
> > intel_bigjoiner_add_affected_planes(struct intel_atomic_state *state)
> > return 0;
> > }
> >
> > -static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
> > -{
> > - struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > -
> > - return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
> > -}
> > -
> > -static bool pxp_is_borked(struct drm_i915_gem_object *obj)
> > -{
> > - return i915_gem_object_is_protected(obj) &&
> > !bo_has_valid_encryption(obj);
> > -}
> > -
> > static int intel_atomic_check_planes(struct intel_atomic_state *state)
> > {
> > struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> > struct intel_crtc_state *old_crtc_state, *new_crtc_state;
> > struct intel_plane_state *plane_state;
> > struct intel_plane *plane;
> > - struct intel_plane_state *new_plane_state;
> > - struct intel_plane_state *old_plane_state;
> > struct intel_crtc *crtc;
> > - const struct drm_framebuffer *fb;
> > int i, ret;
> >
> > ret = icl_add_linked_planes(state);
> > @@ -9093,19 +9077,6 @@ static int intel_atomic_check_planes(struct
> > intel_atomic_state *state)
> > return ret;
> > }
> >
> > - for_each_new_intel_plane_in_state(state, plane, plane_state, i)
> > {
> > - new_plane_state =
> > intel_atomic_get_new_plane_state(state, plane);
> > - old_plane_state =
> > intel_atomic_get_old_plane_state(state, plane);
> > - fb = new_plane_state->hw.fb;
> > - if (fb) {
> > - new_plane_state->decrypt =
> > bo_has_valid_encryption(intel_fb_obj(fb));
> > - new_plane_state->force_black =
> > pxp_is_borked(intel_fb_obj(fb));
> > - } else {
> > - new_plane_state->decrypt = old_plane_state-
> > >decrypt;
> > - new_plane_state->force_black = old_plane_state-
> > >force_black;
> > - }
> > - }
> > -
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > index a0e53a3b267a..1fcb41942c7e 100644
> > --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > @@ -1737,6 +1737,18 @@ static bool skl_fb_scalable(const struct
> > drm_framebuffer *fb)
> > }
> > }
> >
> > +static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
> > +{
> > + struct drm_i915_private *i915 = to_i915(obj->base.dev);
> > +
> > + return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
> > +}
> > +
> > +static bool pxp_is_borked(struct drm_i915_gem_object *obj)
> > +{
> > + return i915_gem_object_is_protected(obj) &&
> > !bo_has_valid_encryption(obj);
> > +}
> > +
> > static int skl_plane_check(struct intel_crtc_state *crtc_state,
> > struct intel_plane_state *plane_state)
> > {
> > @@ -1781,6 +1793,9 @@ static int skl_plane_check(struct
> > intel_crtc_state *crtc_state,
> > if (ret)
> > return ret;
> >
> > + plane_state->decrypt =
> > bo_has_valid_encryption(intel_fb_obj(fb));
> > + plane_state->force_black = pxp_is_borked(intel_fb_obj(fb));
> > +
> > /* HW only has 8 bits pixel precision, disable plane if
> > invisible */
> > if (!(plane_state->hw.alpha >> 8))
> > plane_state->uapi.visible = false;
>
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black()
2021-10-06 23:57 ` [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black() Ville Syrjala
2021-10-07 5:55 ` Li, Juston
@ 2021-10-07 7:14 ` Ville Syrjälä
1 sibling, 0 replies; 14+ messages in thread
From: Ville Syrjälä @ 2021-10-07 7:14 UTC (permalink / raw)
To: intel-gfx
Cc: Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li, Rodrigo Vivi,
Uma Shankar
On Thu, Oct 07, 2021 at 02:57:04AM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> intel_load_plane_csc_black() is specific to glk+ so deserves
> a name reflecting that fact.
After testing on real hw it seems to be icl+ actually
(thank you bspec filter for letting me down).
I'll tweak the name when I apply this.
> Also rename the variables to
> standard form so I won't get confused reading the code.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> .../drm/i915/display/skl_universal_plane.c | 35 +++++++++----------
> 1 file changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 1e85ea98231f..709ab7166d88 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -1011,29 +1011,28 @@ static u32 skl_surf_address(const struct intel_plane_state *plane_state,
> }
> }
>
> -static void intel_load_plane_csc_black(struct intel_plane *intel_plane)
> +static void glk_plane_csc_load_black(struct intel_plane *plane)
> {
> - struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
> - enum pipe pipe = intel_plane->pipe;
> - enum plane_id plane = intel_plane->id;
> - u16 postoff = 0;
> + struct drm_i915_private *i915 = to_i915(plane->base.dev);
> + enum plane_id plane_id = plane->id;
> + enum pipe pipe = plane->pipe;
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 0), 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 1), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 0), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 1), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 2), 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 3), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 2), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 3), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 4), 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_COEFF(pipe, plane, 5), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 4), 0);
> + intel_de_write_fw(i915, PLANE_CSC_COEFF(pipe, plane_id, 5), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 0), 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 1), 0);
> - intel_de_write_fw(dev_priv, PLANE_CSC_PREOFF(pipe, plane, 2), 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 0), 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 1), 0);
> + intel_de_write_fw(i915, PLANE_CSC_PREOFF(pipe, plane_id, 2), 0);
>
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 0), postoff);
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 1), postoff);
> - intel_de_write_fw(dev_priv, PLANE_CSC_POSTOFF(pipe, plane, 2), postoff);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 0), 0);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 1), 0);
> + intel_de_write_fw(i915, PLANE_CSC_POSTOFF(pipe, plane_id, 2), 0);
> }
>
> static void
> @@ -1102,7 +1101,7 @@ skl_program_plane(struct intel_plane *plane,
> * or after the commit, display content will be garbage.
> */
> if (plane_state->force_black)
> - intel_load_plane_csc_black(plane);
> + glk_plane_csc_load_black(plane);
>
> intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
> intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
> --
> 2.32.0
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff
2021-10-06 23:57 ` [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff Ville Syrjala
@ 2021-10-07 18:36 ` Rodrigo Vivi
0 siblings, 0 replies; 14+ messages in thread
From: Rodrigo Vivi @ 2021-10-07 18:36 UTC (permalink / raw)
To: Ville Syrjala
Cc: intel-gfx, Anshuman Gupta, Daniele Ceraolo Spurio, Juston Li,
Uma Shankar
On Thu, Oct 07, 2021 at 02:57:02AM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> There's lots of expensive stuff inserted between the PLANE_CTL
> and PLANE_SURF writes even though the comment before the PLANE_CTL
> write says not to put stuff there. Move it all to a more apporiate
> place.
Yeap, the comment was ignored by all, including me during reviews. Sorry.
I'm wondering now if this entire block deserves a separated function
with more emphasis on the "do not put anything between plane_ctl and
plane_srf...
>
> There's also a weird PLANE_COLOR_CTL RMW in there. I guess because
> force_black was computed way too late originally, but that is now
> sorted.
I would be hesitant in removing that, but since Juston confirmed that
everything works well for him with these patches, it is fine by me.
Great clean-up.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks for this and all the other patches.
>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> .../drm/i915/display/skl_universal_plane.c | 30 +++++++++----------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 1fcb41942c7e..55dae8c8fcad 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -985,6 +985,9 @@ static u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
> plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
> }
>
> + if (plane_state->force_black)
> + plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
> +
> return plane_color_ctl;
> }
>
> @@ -1090,8 +1093,19 @@ skl_program_plane(struct intel_plane *plane,
> aux_dist |= skl_plane_stride(plane_state, aux_plane);
> }
>
> + plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
> + if (plane_state->decrypt)
> + plane_surf |= PLANE_SURF_DECRYPT;
> +
> spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
>
> + /*
> + * FIXME: pxp session invalidation can hit any time even at time of commit
> + * or after the commit, display content will be garbage.
> + */
> + if (plane_state->force_black)
> + intel_load_plane_csc_black(plane);
> +
> intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
> intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
> (crtc_y << 16) | crtc_x);
> @@ -1146,22 +1160,6 @@ skl_program_plane(struct intel_plane *plane,
> * the control register just before the surface register.
> */
> intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
> - plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
> - plane_color_ctl = intel_de_read_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id));
> -
> - /*
> - * FIXME: pxp session invalidation can hit any time even at time of commit
> - * or after the commit, display content will be garbage.
> - */
> - if (plane_state->decrypt) {
> - plane_surf |= PLANE_SURF_DECRYPT;
> - } else if (plane_state->force_black) {
> - intel_load_plane_csc_black(plane);
> - plane_color_ctl |= PLANE_COLOR_PLANE_CSC_ENABLE;
> - }
> -
> - intel_de_write_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id),
> - plane_color_ctl);
> intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), plane_surf);
>
> spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-10-07 18:36 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-06 23:57 [Intel-gfx] [PATCH 0/4] drm/i915: Clean up the pxp stuff Ville Syrjala
2021-10-06 23:57 ` [Intel-gfx] [PATCH 1/4] drm/i915: Move the pxp plane state computation Ville Syrjala
2021-10-07 5:52 ` Li, Juston
2021-10-07 6:41 ` Ville Syrjälä
2021-10-06 23:57 ` [Intel-gfx] [PATCH 2/4] drm/i915: Fix up skl_program_plane() pxp stuff Ville Syrjala
2021-10-07 18:36 ` Rodrigo Vivi
2021-10-06 23:57 ` [Intel-gfx] [PATCH 3/4] drm/i915: Remove the drm_dbg() from the vblank evade critical section Ville Syrjala
2021-10-07 5:54 ` Li, Juston
2021-10-06 23:57 ` [Intel-gfx] [PATCH 4/4] drm/i915: Rename intel_load_plane_csc_black() Ville Syrjala
2021-10-07 5:55 ` Li, Juston
2021-10-07 7:14 ` Ville Syrjälä
2021-10-07 1:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Clean up the pxp stuff Patchwork
2021-10-07 3:53 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-10-07 5:59 ` [Intel-gfx] [PATCH 0/4] " Li, Juston
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.