<div dir="ltr">I noticed I sent a ping on the CI test rather than this patch, so sending a friendly reminder here instead.<div>Thanks!</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Mar 23, 2021 at 11:08 AM Mark Yacoub <<a href="mailto:markyacoub@chromium.org" target="_blank">markyacoub@chromium.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Mark Yacoub <<a href="mailto:markyacoub@google.com" target="_blank">markyacoub@google.com</a>><br>
<br>
Setup all plane params before committing anything.<br>
Do not disable Primary Plane whenever a CRTC is getting enabled.<br>
<br>
AMD Driver requires the primary plane to be enabled whenever the CRTC is, otherwise<br>
drm_mode_cursor_universal may end up trying to enable the cursor plane while all other<br>
planes are disabled, which is not supported by the hardware.<br>
<br>
Tested on Delbin and Volteer with no regression or added latency.<br>
<br>
---<br>
tests/kms_atomic_transition.c | 7 +++----<br>
1 file changed, 3 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c<br>
index 9689bf4d..cfa04dcd 100644<br>
--- a/tests/kms_atomic_transition.c<br>
+++ b/tests/kms_atomic_transition.c<br>
@@ -172,7 +172,7 @@ wm_setup_plane(data_t *data, enum pipe pipe,<br>
continue;<br>
<br>
if (!mask || !(parms[i].mask & mask)) {<br>
- if (plane->values[IGT_PLANE_FB_ID]) {<br>
+ if (plane->values[IGT_PLANE_FB_ID] && plane->type != DRM_PLANE_TYPE_PRIMARY) {<br>
igt_plane_set_fb(plane, NULL);<br>
planes_set_up++;<br>
}<br>
@@ -516,10 +516,9 @@ run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output,<br>
igt_output_set_pipe(output, pipe);<br>
}<br>
<br>
- igt_display_commit2(&data->display, COMMIT_ATOMIC);<br>
-<br>
setup_parms(data, pipe, mode, &fb, &argb_fb, &sprite_fb, parms, &iter_max);<br>
-<br>
+ igt_display_commit2(&data->display, COMMIT_ATOMIC);<br>
+ <br>
/*<br>
* In some configurations the tests may not run to completion with all<br>
* sprite planes lit up at 4k resolution, try decreasing width/size of secondary<br>
-- <br>
2.31.0.rc2.261.g7f71774620-goog<br>
<br>
</blockquote></div>