From: Marius Vlad Subject: Re: [PATCH i-g-t 2/3] lib/igt_kms: Add fail exit branch in do_display_commit() Date: Fri, 19 Feb 2016 15:25:30 +0200 Message-ID: <20160219132521.GA2991@mcvlad-wk.rb.intel.com> References: <1455885293-10964-1-git-send-email-gabriel.feceoru@intel.com> <1455885293-10964-3-git-send-email-gabriel.feceoru@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1022937188==" Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 18C7E6EF3A for ; Fri, 19 Feb 2016 13:24:26 +0000 (UTC) In-Reply-To: <1455885293-10964-3-git-send-email-gabriel.feceoru@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gabriel Feceoru Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1022937188== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wq9mPyueHGvFACwf" Content-Disposition: inline --wq9mPyueHGvFACwf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 19, 2016 at 02:34:52PM +0200, Gabriel Feceoru wrote: > On Cherryview PIPE_C can only be connected to PORT_D (bspec). > The driver properly reports the crtc_mask for the encoder, however the > mismatch between pipe and port is not reported back to the test. >=20 > Add support for detecting this case so the test can be skipped. >=20 > Signed-off-by: Gabriel Feceoru > --- > lib/igt_kms.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index 90c8da7..b18a317 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -1669,6 +1669,7 @@ static int do_display_commit(igt_display_t *display, > bool fail_on_error) > { > int i, ret; > + int valid_outs =3D 0; > =20 > LOG_INDENT(display, "commit"); > =20 > @@ -1680,12 +1681,16 @@ static int do_display_commit(igt_display_t *displ= ay, > if (!output->valid) > continue; > =20 > + valid_outs++; > ret =3D igt_output_commit(output, s, fail_on_error); > CHECK_RETURN(ret, fail_on_error); > } > =20 > LOG_UNINDENT(display); > =20 > + if (valid_outs =3D=3D 0) > + return -1; > + > igt_debug_wait_for_keypress("modeset"); > =20 > return 0; > @@ -1712,9 +1717,7 @@ static int do_display_commit(igt_display_t *display, > int igt_display_commit2(igt_display_t *display, > enum igt_commit_style s) > { > - do_display_commit(display, s, true); > - > - return 0; > + return do_display_commit(display, s, true); Wouldn't igt_display_try_commit2() achieve the same thing? > } > =20 > /** > --=20 > 1.9.1 >=20 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx --wq9mPyueHGvFACwf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJWxxfIAAoJELmLWIAQzyE+ws0H/2YlqwjRu9AQiPsq93T/+kg3 fKQyUvctraLpFEB4PvVJIbN6L0Xkxy5adibdhJkL8K0t5bxqi0JzNAuGtLf+ap8S l3OUOkF5fDyYoomueeIZ+9USSHza+Z6QB9Om5nMqt70TsVuduf6PF3mPstxO3lQj HxH/DN2znF0aeN3ceAOw0oxuD4hykrvX64s0cnqyxjHUgnFyxAMeY36pq0FogIMZ XMzHI5PkoFUKXbR5jS75/QyUfV6aKegevoetsm65z3CFvxYGBiuQzIexnlRjRo3q PuHtq6w4NXhqdBcjJ8eCVn33TsDuj0iDirSUr342ahVQc1Vv6j/KQRfXSYbtz6o= =OppX -----END PGP SIGNATURE----- --wq9mPyueHGvFACwf-- --===============1022937188== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============1022937188==--