From patchwork Fri Aug 14 15:44:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 7016141 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 6616A9F344 for ; Fri, 14 Aug 2015 15:44:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A29B3207F8 for ; Fri, 14 Aug 2015 15:44:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 02D5D207F7 for ; Fri, 14 Aug 2015 15:44:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75D226EF9C; Fri, 14 Aug 2015 08:44:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BDD16EF9C for ; Fri, 14 Aug 2015 08:44:41 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 14 Aug 2015 08:44:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,678,1432623600"; d="scan'208";a="748659185" Received: from ideak-desk.fi.intel.com ([10.237.72.74]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 08:44:39 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Fri, 14 Aug 2015 18:44:38 +0300 Message-Id: <1439567078-29459-1-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [Intel-gfx] [PATCH igt] lib/ioctl_wrappers: handle ENODEV from from GEM_SET_CACHING ioctl 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 The ENODEV return value was introduced to the GEM_SET_CACHING ioctl to mean that the given platform doesn't support the requested caching level (currently only due to a HW issues on BXT A steppings). Handle this as the other cases where we want to skip the related subtests. Signed-off-by: Imre Deak --- lib/ioctl_wrappers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 53bd635..25f0b2c 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -201,7 +201,8 @@ void gem_set_caching(int fd, uint32_t handle, uint32_t caching) arg.caching = caching; ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg); - igt_assert(ret == 0 || (errno == ENOTTY || errno == EINVAL)); + igt_assert(ret == 0 || (errno == ENOTTY || errno == EINVAL || + errno == ENODEV)); igt_require(ret == 0); errno = 0; }