From patchwork Thu Sep 21 14:39:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 9964065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 608716020C for ; Thu, 21 Sep 2017 14:39:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B7C729291 for ; Thu, 21 Sep 2017 14:39:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4072B292E4; Thu, 21 Sep 2017 14:39:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8612629291 for ; Thu, 21 Sep 2017 14:39:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A43C6E865; Thu, 21 Sep 2017 14:39:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 418276E865 for ; Thu, 21 Sep 2017 14:39:49 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2017 07:39:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,425,1500966000"; d="scan'208"; a="1174509746" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga001.jf.intel.com with SMTP; 21 Sep 2017 07:39:46 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 21 Sep 2017 17:39:45 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Thu, 21 Sep 2017 17:39:32 +0300 Message-Id: <20170921143933.14618-5-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170921143933.14618-1-ville.syrjala@linux.intel.com> References: <20170921143933.14618-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 5/6] tests/kms_panel_fitting: Skip sprite test if we exceed sprite scaling limits X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Ville Syrjälä g4x-bdw surface isn't allowed to exceed 2kx2k pixels when scaling, and the stride must not exceed 4k bytes. The test tries to scale a 1920x1080 32bpp image which exceeds the sprite's stride limitations. Let's make the test a bit more tolerant and just ignore failures from the sprite tests. This does reduce the usefulness of the test somewhat, but without CRC support the test isn't all that useful anyway. Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=132953 Signed-off-by: Ville Syrjälä --- tests/kms_panel_fitting.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c index 5266862a70cf..af3e39fd7b22 100644 --- a/tests/kms_panel_fitting.c +++ b/tests/kms_panel_fitting.c @@ -197,12 +197,16 @@ static void test_panel_fitting(data_t *d) igt_fb_set_size(&d->fb2, d->plane2, d->fb2.width-200, d->fb2.height-200); igt_plane_set_position(d->plane2, 100, 100); igt_plane_set_size(d->plane2, mode->hdisplay-200, mode->vdisplay-200); - igt_display_commit2(display, COMMIT_UNIVERSAL); - - /* enable panel fitting along with sprite scaling */ - mode->hdisplay = 1024; - mode->vdisplay = 768; - prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_LEGACY); + /* + * The sprite may not be able to scale such a large image. + * Just skip the sprite scaling tests in that case. + */ + if (!igt_display_try_commit2(display, COMMIT_UNIVERSAL)) { + /* enable panel fitting along with sprite scaling */ + mode->hdisplay = 1024; + mode->vdisplay = 768; + prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_LEGACY); + } /* back to single plane mode */ igt_plane_set_fb(d->plane2, NULL);