From patchwork Wed Apr 20 16:25:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 8892821 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 346DCBF29F for ; Wed, 20 Apr 2016 16:26:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69A2920172 for ; Wed, 20 Apr 2016 16:26:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 52F472010C for ; Wed, 20 Apr 2016 16:26:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD9FE6E184; Wed, 20 Apr 2016 16:26:20 +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 AA71D6EA67 for ; Wed, 20 Apr 2016 16:25:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 1023A2669F0 From: robert.foss@collabora.com To: daniel@ffwll.ch Date: Wed, 20 Apr 2016 12:25:52 -0400 Message-Id: <1461169552-14159-3-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461169552-14159-1-git-send-email-robert.foss@collabora.com> References: <1461169552-14159-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t v2 2/2] core_getversion: Only verify major version for i915. 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=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Robert Foss This change mirrors the change in drm made by krh@redhat.com on "Mon Apr 6 17:18:17 2009" on the drm branch intel_on_all_hw. The assert(major < 1) is only needed for the legacy intel driver. Signed-off-by: Robert Foss --- tests/core_getversion.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/core_getversion.c b/tests/core_getversion.c index b336e9f..f6b0126 100644 --- a/tests/core_getversion.c +++ b/tests/core_getversion.c @@ -42,7 +42,9 @@ igt_simple_main igt_assert_neq(strlen(v->name), 0); igt_assert_neq(strlen(v->date), 0); igt_assert_neq(strlen(v->desc), 0); - igt_assert_lt(1, v->version_major); + if (is_i915_device(fd)) + igt_assert_lt(1, v->version_major); + drmFree(v); close(fd); }