From patchwork Thu Aug 31 05:58:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Krisman Bertazi X-Patchwork-Id: 9931225 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 AB60360362 for ; Thu, 31 Aug 2017 05:59:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E90728846 for ; Thu, 31 Aug 2017 05:59:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9366C2884A; Thu, 31 Aug 2017 05:59:10 +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 5254228846 for ; Thu, 31 Aug 2017 05:59:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E24736E697; Thu, 31 Aug 2017 05:59:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id EEF426E697 for ; Thu, 31 Aug 2017 05:59:08 +0000 (UTC) Received: from localhost (unknown [IPv6:2a00:5f00:102:0:8c39:81ff:fe68:83db]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: krisman) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 612FC269D1A; Thu, 31 Aug 2017 06:59:07 +0100 (BST) From: Gabriel Krisman Bertazi To: intel-gfx@lists.freedesktop.org Date: Thu, 31 Aug 2017 02:58:18 -0300 Message-Id: <20170831055818.11796-8-krisman@collabora.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170831055818.11796-1-krisman@collabora.co.uk> References: <20170831055818.11796-1-krisman@collabora.co.uk> Cc: daniel.vetter@intel.com, daniels@collabora.com, tomeu.vizoso@collabora.com Subject: [Intel-gfx] [PATCH v2 7/7] tests/kms_ccs: Test case for wrong aux buffer stripe size 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 Two scenarios tested: - unaligned stripe - Stripe too small Signed-off-by: Gabriel Krisman Bertazi --- tests/kms_ccs.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c index 95de6963226d..2e6efe95ffca 100644 --- a/tests/kms_ccs.c +++ b/tests/kms_ccs.c @@ -36,15 +36,18 @@ enum test_flags { TEST_NO_AUX_BUFFER = 1 << 5, TEST_BAD_CCS_OFFSET = 1 << 6, TEST_BAD_CCS_HANDLE = 1 << 7, + TEST_BAD_AUX_STRIDE = 1 << 8, }; #define TEST_FAIL_ON_ADDFB2 \ (TEST_BAD_PIXEL_FORMAT | TEST_NO_AUX_BUFFER | TEST_BAD_CCS_OFFSET | \ - TEST_BAD_CCS_HANDLE) + TEST_BAD_CCS_HANDLE | TEST_BAD_AUX_STRIDE) enum test_fb_flags { FB_COMPRESSED = 1 << 0, FB_HAS_PLANE = 1 << 1, + FB_MISALIGN_AUX_STRIDE = 1 << 2, + FB_SMALL_AUX_STRIDE = 1 << 3, }; typedef struct { @@ -323,7 +326,14 @@ static void generate_fb(data_t *data, struct igt_fb *fb, */ int ccs_width = ALIGN(width * 4, 32) / 32; int ccs_height = ALIGN(height, 16) / 16; - f.pitches[1] = ALIGN(ccs_width * 1, 128); + int aux_stride = ALIGN(ccs_width * 1, 128); + + if (fb_flags & FB_MISALIGN_AUX_STRIDE) + aux_stride = ccs_width; + else if (fb_flags & FB_SMALL_AUX_STRIDE) + aux_stride = ALIGN(ccs_width/2, 128); + + f.pitches[1] = aux_stride; f.modifier[1] = modifier; if (data->flags & TEST_BAD_CCS_OFFSET) { @@ -478,6 +488,11 @@ static void test_output(data_t *data) try_config(data, fb_flags | FB_COMPRESSED); } + if (data->flags & TEST_BAD_AUX_STRIDE) { + try_config(data, fb_flags | FB_COMPRESSED | FB_MISALIGN_AUX_STRIDE); + try_config(data, fb_flags | FB_COMPRESSED | FB_SMALL_AUX_STRIDE); + } + primary = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_PRIMARY); igt_plane_set_fb(primary, NULL); igt_plane_set_rotation(primary, IGT_ROTATION_0); @@ -556,6 +571,9 @@ igt_main igt_subtest_f("pipe-%s-ccs-on-another-bo", pipe_name) test_output(&data); + data.flags = TEST_BAD_AUX_STRIDE; + igt_subtest_f("pipe-%s-bad-aux-stride", pipe_name) + test_output(&data); } igt_fixture