From patchwork Wed Mar 2 14:00:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8480861 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 14CB99F38C for ; Wed, 2 Mar 2016 14:01:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E1C6201EC for ; Wed, 2 Mar 2016 14:01:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3344E2011B for ; Wed, 2 Mar 2016 14:01:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 575F36E887; Wed, 2 Mar 2016 14:01:38 +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 DF4BB6E886 for ; Wed, 2 Mar 2016 14:01:18 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n186so9823837wmn.0 for ; Wed, 02 Mar 2016 06:01:18 -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=3MQ/F04AaxjX5xbEtSzAyClufI4LEw/EGHgca4ax2Sg=; b=dQFq7kuFD57sXV1w3VP2Rg2i6sB0YJcqN/BWSuXWYGxL4pdRJau4ueAuNj+5IN9epz YQpNvU3hEqTSXDAmeojPsQrKVurgo3KhypKOIuSIOb0Fl30CmM4d9UEbM+qIp6o/jY0m dYaND5Sxvsh/L3k66FU/hRJseybEiuznHbgNuTVHqwmiD3zyc3B+ixJwVU4jBb58DTsI iehm7CUzGktENgjgtkE0H6Szy+lxy3aetKfq+k21Vt8ckpACWHA8KIduQfRnmICzqlGR 8WS+8djK9hGz2+UV9jZFF6y+Op9gPQXIrQlCeOZijERP8bHhDgYuct5v6CHWxn7HAOfv YN8g== 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=3MQ/F04AaxjX5xbEtSzAyClufI4LEw/EGHgca4ax2Sg=; b=G859xwvQvuxlqFPfN+Y+LfyHKBbXC9E1K1vj+CQwSU2N2gK8fm4mtPhMrOh/TbLebW fJ2aJhh0QGbAR6EJKfLsNagCZ4UlZvappJ6LGTsFJSjSmFgb2SpDU9KHalZeG5zEFbsn Ww9reczbTIYyAvViFVaNTBCHYi4xvmhJeN35zcx9cPSrLy8S/oDq0gKD5K9DDKgY3epR cslmBDAEZS5cC0JIaOL/+27sl9IKzNfuKETW2ytdoDa19C5hJj4rpo8K2G6go1SPmhI0 Lso/8unNa/ogDcwBQwaADTARp9uXbt+eydxL6q5Uv693EDJbbk6FPoAHPt8dOLM6j1Nk w6wA== X-Gm-Message-State: AD7BkJKNE4G+y55m5mTWiXqS73KujAZ1qznsBQmnigwIjfznguJsa/+KvAqXvYAcvV+txQ== X-Received: by 10.28.223.8 with SMTP id w8mr66505wmg.54.1456927277192; Wed, 02 Mar 2016 06:01:17 -0800 (PST) Received: from cizrna.lan ([109.72.12.223]) by smtp.gmail.com with ESMTPSA id e19sm4359876wmd.1.2016.03.02.06.01.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 06:01:16 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Wed, 2 Mar 2016 15:00:17 +0100 Message-Id: <1456927221-32421-11-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 10/14] kms_addfb_basic: call igt_create_bo_with_dimensions 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 Many tests can do their work on drivers other than i915 and even with just dumb buffers, so call igt_create_bo_with_dimensions instead of gem_create which will paper out the differences and call the proper ioctls or cause the subtest to be skipped if that's not possible. Signed-off-by: Tomeu Vizoso --- tests/kms_addfb_basic.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index d36cc6aab231..473b5e9d7236 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -51,9 +51,11 @@ static void invalid_tests(int fd) f.pitches[0] = 512*4; igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); + gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); + gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo_small); f.handles[0] = gem_bo; @@ -129,7 +131,8 @@ static void pitch_tests(int fd) f.pitches[0] = 1024*4; igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); + gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo); } @@ -211,9 +214,11 @@ static void size_tests(int fd) f_8.pitches[0] = 1024*2; igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); + gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1024*4 - 4096); + gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo_small); } @@ -293,7 +298,8 @@ static void addfb25_tests(int fd) struct local_drm_mode_fb_cmd2 f = {}; igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); + gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo); memset(&f, 0, sizeof(f)); @@ -364,9 +370,11 @@ static void addfb25_ytile(int fd, int gen) int shouldret; igt_fixture { - gem_bo = gem_create(fd, 1024*1024*4); + gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo); - gem_bo_small = gem_create(fd, 1024*1023*4); + gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023, + DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL); igt_assert(gem_bo_small); shouldret = gen >= 9 ? 0 : -1;