From patchwork Tue Nov 29 13:57:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 9452157 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 F3D4060235 for ; Tue, 29 Nov 2016 13:56:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E601E27F4B for ; Tue, 29 Nov 2016 13:56:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAB5C28173; Tue, 29 Nov 2016 13:56:52 +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 7C5EF27F4B for ; Tue, 29 Nov 2016 13:56:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EE7A6E578; Tue, 29 Nov 2016 13:56:49 +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 ESMTPS id 7C0E96E578 for ; Tue, 29 Nov 2016 13:56:48 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 29 Nov 2016 05:56:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.31,717,1473145200"; d="scan'208"; a="1075038580" Received: from sorvi.fi.intel.com ([10.237.72.109]) by fmsmga001.fm.intel.com with ESMTP; 29 Nov 2016 05:56:45 -0800 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Date: Tue, 29 Nov 2016 15:57:04 +0200 Message-Id: <1480427824-9948-1-git-send-email-mika.kahola@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_plane_multiple: Fix CRC based atomic correctness test 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 Fixes issues on kms_plane_multiple i-g-t test found when running CI tests v1: - don't use tiling for cursor plane (Ville) - for y/yf tiling check that the platform is at least GEN9 (Ville) Cc: Ville Syrjala Cc: Maarten Lankhorst Signed-off-by: Mika Kahola Reviewed-by: Maarten Lankhorst --- tests/kms_plane_multiple.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c index bedee16..5e12be4 100644 --- a/tests/kms_plane_multiple.c +++ b/tests/kms_plane_multiple.c @@ -210,7 +210,7 @@ prepare_planes(data_t *data, enum pipe pipe, color_t *color, igt_create_color_fb(data->drm_fd, size[i], size[i], data->plane[i]->is_cursor ? DRM_FORMAT_ARGB8888 : DRM_FORMAT_XRGB8888, - tiling, + data->plane[i]->is_cursor ? LOCAL_DRM_FORMAT_MOD_NONE : tiling, color->red, color->green, color->blue, &data->fb[i]); @@ -349,6 +349,7 @@ test_plane_position(data_t *data, enum pipe pipe, bool atomic, int max_planes, { igt_output_t *output; int connected_outs; + int devid = intel_get_drm_devid(data->drm_fd); if (atomic) igt_require(data->display.is_atomic); @@ -356,6 +357,10 @@ test_plane_position(data_t *data, enum pipe pipe, bool atomic, int max_planes, igt_skip_on(pipe >= data->display.n_pipes); igt_skip_on(max_planes >= data->display.pipes[pipe].n_planes); + if ((tiling == LOCAL_I915_FORMAT_MOD_Y_TILED || + tiling == LOCAL_I915_FORMAT_MOD_Yf_TILED)) + igt_require(AT_LEAST_GEN(devid, 9)); + if (!opt.user_seed) opt.seed = time(NULL);