From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: Re: [PATCH i-g-t] tests/kms_plane_scaling: Fix off-by-one plane selection Date: Mon, 06 Nov 2017 19:39:40 +0100 Message-ID: <1509993580.2124.2.camel@collabora.com> References: <20171106182831.4884-1-krisman@collabora.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0469724150==" Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0EA5A6E3BC for ; Mon, 6 Nov 2017 18:39:44 +0000 (UTC) In-Reply-To: <20171106182831.4884-1-krisman@collabora.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gabriel Krisman Bertazi , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0469724150== Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-qYeADy1J3prysRRMyfbs" --=-qYeADy1J3prysRRMyfbs Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey Gabriel, I've reviewed and pushed this patch. Thanks. Rob. On Mon, 2017-11-06 at 16:28 -0200, Gabriel Krisman Bertazi wrote: > Commit ca20170afc6f ("tests/kms_plane_scaling: Add support for > dynamic > number of planes") shifted the tested planes by one after the > refactoring, accidentally ignoring the first plane, which is zero > indexed. A symptom of the issue appears on KBL, where the third > plane > is already the shared cursor, causing igt to configure an unsupported > framebuffer format on it, triggering the following error: >=20 > [drm:__setplane_internal] Invalid pixel format XR24 little-endian > (0x34325258) >=20 > With this fixed, we can exposes the pixel clock scaling issue, which > is > the actual problem being tracked in Bug 103159, but let's start by > reverting to the old behavior. >=20 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D103159 > Fixes: ca20170afc6f ("tests/kms_plane_scaling: Add support for > dynamic number of planes") > Signed-off-by: Gabriel Krisman Bertazi > --- > tests/kms_plane_scaling.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c > index 5ed69f35f267..403df47e2d3b 100644 > --- a/tests/kms_plane_scaling.c > +++ b/tests/kms_plane_scaling.c > @@ -195,7 +195,7 @@ static void test_plane_scaling(data_t *d) > igt_assert(d->fb_id3); > =20 > /* Set up display with plane 1 */ > - d->plane1 =3D igt_output_get_plane(output, 1); > + d->plane1 =3D igt_output_get_plane(output, 0); > prepare_crtc(d, output, pipe, d->plane1, mode, > COMMIT_UNIVERSAL); > =20 > if (primary_plane_scaling) { > @@ -215,7 +215,7 @@ static void test_plane_scaling(data_t *d) > } > =20 > /* Set up fb2->plane2 mapping. */ > - d->plane2 =3D igt_output_get_plane(output, 2); > + d->plane2 =3D igt_output_get_plane(output, 1); > igt_plane_set_fb(d->plane2, &d->fb2); > =20 > /* 2nd plane windowed */ > @@ -251,7 +251,7 @@ static void test_plane_scaling(data_t *d) > } > =20 > /* Set up fb3->plane3 mapping. */ > - d->plane3 =3D igt_output_get_plane(output, 3); > + d->plane3 =3D igt_output_get_plane(output, 2); > igt_plane_set_fb(d->plane3, &d->fb3); > =20 > /* 3rd plane windowed - no scaling */ --=-qYeADy1J3prysRRMyfbs Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJaAKxsAAoJELeaC2oR7vcnh1sQAI+tiXZKwtSpiB9zH32D1tkc 2EqfXGDwLFUvzMqumFT+kogSZPT9klR8WfZzaL3O4gjLX+C9vHCBVdVORbCZ/QFH //KAFrTtgVMahZC/Dlf6b0FpTo0UCqYS+s+Fj37lEG0hLoPoKE5BZo3A3echA1xm c2OCA2kdN5YygoN6/7actECQonHclRdqyM/b7H1LD2Bhm3HRqR1a8rNvVOlouCot xxMWtM2caBc5d2ZzLH1I+ZoasoPH2o9Bh4fnfQlKB+a77mdxZOEyLwoWeN/QTp/U kH00nfEuYU3H53rY+nkjrQoD752otLXS//MGQc/UELSrpkvg4BEk/wWAWVce8DcK rMtODt645mYl3zR19Ek6v2NmHVxUnpx4t3b78KVWR60AtCzy5lrQmGVt4ZpPFhAK mb/WyqKjDND7ne2IQzTABzwuPz0ODMKaTsZ5fRBqHB0t/uFOLrUx241cd1DZuThV oGcHaT7xh+9X4I7fZx861GdBnP5CIKGXBIFOGHeL2Sukg+BFI8nnLSUbO8tgIk+x butQsjFs+mF5WEahfOzSEzq2ZvV+kbpSwo6gt74G8eTe2X0bC+Q/iK9tXhLF+LdJ rjSv//TMkCJSMsq0dcnzqALNe9kryKsQoWml2mZOSn95jKMQMB2ppbjqUl5pCsNc ujPTjoMJr34yPtvA4o9Z =O4HA -----END PGP SIGNATURE----- --=-qYeADy1J3prysRRMyfbs-- --===============0469724150== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0469724150==--