From patchwork Wed Mar 2 14:00:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8480841 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 577B3C0553 for ; Wed, 2 Mar 2016 14:01:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C18620394 for ; Wed, 2 Mar 2016 14:01:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 77AE9202AE for ; Wed, 2 Mar 2016 14:01:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 417576E883; Wed, 2 Mar 2016 14:01:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B94806E883 for ; Wed, 2 Mar 2016 14:01:24 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id 1so9786411wmg.2 for ; Wed, 02 Mar 2016 06:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5gowzKNcACHINvxKGpAonekeKsTsdPhSGPtrGAC1B6g=; b=qaS3nvDFV4cLT5w6AONcsQ8SiF0m2y0B0q9XaSpTYPlIo2Y7Sh+LSWkGacmdPx8pdy BHxooUHRpJuax6qqfLgEEijc6XmRagCQnEyEQ0JrDczlKLmoRi3YdCeH1y2NKbsnQmgP 3nlvQt7yp1e+RqTiscqeR8QT33wTbZMOzvmpUJPq9b+qWO+4nHhhlte+5SFdPZqR7ESA qpIGQY2XIyQMlpTfnTCfct4T4y1mF2PYJNeFmqvssOesHQPhMjhygTHCh7XpEXK1tpur DIOtQD9vNqDZLzz2kwJSjdlg5m3os9AeGuHt9glAt3zkzkrhhGhVruH0oq4mbc3H+vSY ktdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5gowzKNcACHINvxKGpAonekeKsTsdPhSGPtrGAC1B6g=; b=kthCL9fDr9J5AOg45Qu2CXuoF8lzKSVsQhXsAdD8tASiuVrNVAqqYPhrpfelEOLFs/ qHfYZH1FNbJJJ+HRslo5Em7GpqNCsN/hMIKCNHuUjyVuGpSoQBGSIKf4T1o/LwqVe2rr 3cVCSCv2Vemm7QZHDTv1/DCFTQ5zQOJEJWm7tTrvDNVvMtOc7ogvbq61lSUmrivFxe1S q6MvBKCgTdIkPryC4gjbmJ7lgLxMnAj8Rva55rpoy+p2sC82Ev9g6WdY5inw1mEyzIfW fEg7xQQIHpsG8QVqfCUuzFJPnLWwt6zbcP4BrvSUIODbURfSt3rSd5HerOA2ThQQOOTs 8/ng== X-Gm-Message-State: AD7BkJKgDFBotrTzD0b4WU/7Gb88Dj4L5S7FLzkww6Gp44SucRuuvrSzRtkZwA4DeszPaw== X-Received: by 10.194.95.73 with SMTP id di9mr29503294wjb.152.1456927282886; Wed, 02 Mar 2016 06:01:22 -0800 (PST) Received: from cizrna.lan ([109.72.12.223]) by smtp.gmail.com with ESMTPSA id e19sm4359876wmd.1.2016.03.02.06.01.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 06:01:22 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Wed, 2 Mar 2016 15:00:21 +0100 Message-Id: <1456927221-32421-15-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456927221-32421-1-git-send-email-tomeu.vizoso@collabora.com> References: <1456927221-32421-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v1 14/14] kms_addfb_basic: Get intel gen from within subtest 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because determining the Intel GFX generation requires a call to DRM_IOCTL_I915_GETPARAM, move the code that requires it to a subtest that can be skipped on drivers other than i915. Signed-off-by: Tomeu Vizoso --- tests/kms_addfb_basic.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index daba6b9aaeed..30f312291fe7 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -399,10 +399,21 @@ static void addfb25_tests(int fd) gem_close(fd, gem_bo); } -static void addfb25_ytile(int fd, int gen) +static int addfb_expected_ret(int fd) +{ + int gen; + + if (!is_i915_device(fd)) + return 0; + + gen = intel_gen(intel_get_drm_devid(fd)); + return gen >= 9 ? 0 : -1; +} + +static void addfb25_ytile(int fd) { struct local_drm_mode_fb_cmd2 f = {}; - int shouldret; + int gen; igt_fixture { gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, @@ -412,8 +423,6 @@ static void addfb25_ytile(int fd, int gen) DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo_small); - shouldret = gen >= 9 ? 0 : -1; - memset(&f, 0, sizeof(f)); f.width = 1024; @@ -430,8 +439,9 @@ static void addfb25_ytile(int fd, int gen) igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); - if (!shouldret) + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == + addfb_expected_ret(fd)); + if (!addfb_expected_ret(fd)) igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); f.fb_id = 0; } @@ -440,14 +450,17 @@ static void addfb25_ytile(int fd, int gen) igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_I915_FORMAT_MOD_Yf_TILED; - igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == shouldret); - if (!shouldret) + igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == + addfb_expected_ret(fd)); + if (!addfb_expected_ret(fd)) igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0); f.fb_id = 0; } igt_subtest("addfb25-Y-tiled-small") { igt_require_fb_modifiers(fd); + + gen = intel_gen(intel_get_drm_devid(fd)); igt_require(gen >= 9); f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED; @@ -464,14 +477,11 @@ static void addfb25_ytile(int fd, int gen) } int fd; -int gen; igt_main { - igt_fixture { + igt_fixture fd = drm_open_driver_master(DRIVER_ANY); - gen = intel_gen(intel_get_drm_devid(fd)); - } invalid_tests(fd); @@ -481,7 +491,7 @@ igt_main addfb25_tests(fd); - addfb25_ytile(fd, gen); + addfb25_ytile(fd); tiling_tests(fd);