From patchwork Wed Jun 1 22:13:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 9148585 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 1BF7860467 for ; Wed, 1 Jun 2016 22:13:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFC65264F4 for ; Wed, 1 Jun 2016 22:13:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1FEB27151; Wed, 1 Jun 2016 22:13:35 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78FBF264F4 for ; Wed, 1 Jun 2016 22:13:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B59FD6E2A0; Wed, 1 Jun 2016 22:13:32 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CC626E2A0 for ; Wed, 1 Jun 2016 22:13:30 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 01 Jun 2016 15:13:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="993350670" Received: from mdroper-hswdev.fm.intel.com (HELO mdroper-hswdev) ([10.1.134.210]) by fmsmga002.fm.intel.com with ESMTP; 01 Jun 2016 15:13:29 -0700 Received: from mattrope by mdroper-hswdev with local (Exim 4.84_2) (envelope-from ) id 1b8EOH-00051m-As; Wed, 01 Jun 2016 15:13:29 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Wed, 1 Jun 2016 15:13:19 -0700 Message-Id: <1464819199-19292-1-git-send-email-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [Intel-gfx] [PATCH i-g-t] kms_plane_scaling: Don't try to use second scaler on pipe C 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Gen9 has two scalers on pipes A & B, but only a single scaler on pipe C. We should bail out of the test early on pipe C so that we don't ask the kernel to use more scalers than we really have. Note that this test may still fail (on any pipe) if we're already using one of the scalers as a panel fitter. But at least this is an improvement over the existing state where the test is guaranteed to fail if run with pipe C active. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92248 Signed-off-by: Matt Roper --- tests/kms_plane_scaling.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index ad5404d..2b17702 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -264,6 +264,9 @@ static void test_plane_scaling(data_t *d) igt_display_commit2(display, COMMIT_UNIVERSAL); } + if (pipe == PIPE_C) + goto crtcdone; + /* Set up fb3->plane3 mapping. */ d->plane3 = igt_output_get_plane(output, IGT_PLANE_3); igt_plane_set_fb(d->plane3, &d->fb3); @@ -301,9 +304,11 @@ static void test_plane_scaling(data_t *d) igt_display_commit2(display, COMMIT_UNIVERSAL); } +crtcdone: /* back to single plane mode */ igt_plane_set_fb(d->plane2, NULL); - igt_plane_set_fb(d->plane3, NULL); + if (pipe != PIPE_C) + igt_plane_set_fb(d->plane3, NULL); igt_display_commit2(display, COMMIT_UNIVERSAL); valid_tests++;