From patchwork Wed Nov 15 19:36:59 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: 10060101 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 D7798604D4 for ; Wed, 15 Nov 2017 19:37:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C64EA2A1F7 for ; Wed, 15 Nov 2017 19:37:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB45D2A288; Wed, 15 Nov 2017 19:37:37 +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 47C482A1F7 for ; Wed, 15 Nov 2017 19:37:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED8B06E6C3; Wed, 15 Nov 2017 19:37:36 +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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 578DB6E6C3 for ; Wed, 15 Nov 2017 19:37:35 +0000 (UTC) Received: from localhost (unknown [IPv6:2a00:5f00:102:0:bc15:48ff:fe3a:91d2]) (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 657E026F12C; Wed, 15 Nov 2017 19:37:33 +0000 (GMT) From: Gabriel Krisman Bertazi To: intel-gfx@lists.freedesktop.org Date: Wed, 15 Nov 2017 17:36:59 -0200 Message-Id: <20171115193701.12781-5-krisman@collabora.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171115193701.12781-1-krisman@collabora.co.uk> References: <20171115193701.12781-1-krisman@collabora.co.uk> Cc: ben@bwidawsk.net, daniel.vetter@intel.com Subject: [Intel-gfx] [PATCH i-g-t v5 4/6] tests/kms_ccs: Test case where the CCS buffer was not provided 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 Signed-off-by: Gabriel Krisman Bertazi Reviewed-by: Arkadiusz Hiler --- tests/kms_ccs.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c index 73025a1e019f..3d14fed91f2e 100644 --- a/tests/kms_ccs.c +++ b/tests/kms_ccs.c @@ -33,8 +33,12 @@ enum test_flags { TEST_ROTATE_180 = 1 << 2, TEST_BAD_PIXEL_FORMAT = 1 << 3, TEST_BAD_ROTATION_90 = 1 << 4, + TEST_NO_AUX_BUFFER = 1 << 5, }; +#define TEST_FAIL_ON_ADDFB2 \ + (TEST_BAD_PIXEL_FORMAT | TEST_NO_AUX_BUFFER) + enum test_fb_flags { FB_COMPRESSED = 1 << 0, FB_HAS_PLANE = 1 << 1, @@ -315,22 +319,30 @@ 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); - f.modifier[1] = modifier; - f.offsets[1] = size[0]; - size[1] = f.pitches[1] * ALIGN(ccs_height, 32); + int ccs_pitches = ALIGN(ccs_width * 1, 128); + int ccs_offsets = size[0]; + + size[1] = ccs_pitches * ALIGN(ccs_height, 32); f.handles[0] = gem_create(data->drm_fd, size[0] + size[1]); - f.handles[1] = f.handles[0]; - render_ccs(data, f.handles[1], f.offsets[1], size[1], - height, f.pitches[1]); - } else + + if (!(data->flags & TEST_NO_AUX_BUFFER)) { + f.modifier[1] = modifier; + f.handles[1] = f.handles[0]; + f.pitches[1] = ccs_pitches; + f.offsets[1] = ccs_offsets; + + render_ccs(data, f.handles[1], f.offsets[1], size[1], + height, f.pitches[1]); + } + } else { f.handles[0] = gem_create(data->drm_fd, size[0]); + } render_fb(data, f.handles[0], size[0], fb_flags, height, f.pitches[0]); ret = drmIoctl(data->drm_fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f); - if (data->flags & TEST_BAD_PIXEL_FORMAT) { + if (data->flags & TEST_FAIL_ON_ADDFB2) { igt_assert_eq(ret, -1); igt_assert_eq(errno, EINVAL); return; @@ -379,7 +391,7 @@ static void try_config(data_t *data, enum test_fb_flags fb_flags) drm_mode->vdisplay, fb_flags); } - if (data->flags & TEST_BAD_PIXEL_FORMAT) + if (data->flags & TEST_FAIL_ON_ADDFB2) return; igt_plane_set_position(primary, 0, 0); @@ -446,7 +458,8 @@ static void test_output(data_t *data) } if (data->flags & TEST_BAD_PIXEL_FORMAT || - data->flags & TEST_BAD_ROTATION_90) { + data->flags & TEST_BAD_ROTATION_90 || + data->flags & TEST_NO_AUX_BUFFER) { try_config(data, fb_flags | FB_COMPRESSED); } @@ -515,6 +528,11 @@ igt_main } data.plane = NULL; + + data.flags = TEST_NO_AUX_BUFFER; + igt_subtest_f("pipe-%s-missing-ccs-buffer", pipe_name) + test_output(&data); + } igt_fixture