From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 427A5C4338F for ; Mon, 2 Aug 2021 06:25:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B1E961042 for ; Mon, 2 Aug 2021 06:25:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0B1E961042 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 666B36E057; Mon, 2 Aug 2021 06:25:06 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9E6A6E057; Mon, 2 Aug 2021 06:25:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10063"; a="277163335" X-IronPort-AV: E=Sophos;i="5.84,288,1620716400"; d="scan'208";a="277163335" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2021 23:25:03 -0700 X-IronPort-AV: E=Sophos;i="5.84,288,1620716400"; d="scan'208";a="501655429" Received: from adixit-mobl1.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.209.17.228]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2021 23:25:03 -0700 Date: Sun, 01 Aug 2021 23:25:02 -0700 Message-ID: <87sfzs5poh.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Matthew Auld Cc: , , Maarten Lankhorst , Daniel Vetter , Ramalingam C In-Reply-To: <20210730085348.2326899-9-matthew.auld@intel.com> References: <20210730085348.2326899-1-matthew.auld@intel.com> <20210730085348.2326899-9-matthew.auld@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH i-g-t v3 09/11] tests/i915/module_load: update for discrete X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 30 Jul 2021 01:53:46 -0700, Matthew Auld wrote: > > The set_caching ioctl is gone for discrete, and now just returns > -ENODEV. Update the gem_sanitycheck to account for that. After this we > should be back to just having the breakage caused by missing reloc > support for the reload testcase. > > Signed-off-by: Matthew Auld > Cc: Maarten Lankhorst > Cc: Ashutosh Dixit > Cc: Daniel Vetter > Cc: Ramalingam C > --- > tests/i915/i915_module_load.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c > index 98ceb5d8..4b42fe3e 100644 > --- a/tests/i915/i915_module_load.c > +++ b/tests/i915/i915_module_load.c > @@ -172,17 +172,22 @@ static void gem_sanitycheck(void) > { > struct drm_i915_gem_caching args = {}; > int i915 = __drm_open_driver(DRIVER_INTEL); > + int expected; If we want to reduce a couple of line of code this is: int expected = gem_has_lmem(i915) ? -ENODEV : -ENOENT; Otherwise this is: Reviewed-by: Ashutosh Dixit > int err; > > + expected = -ENOENT; > + if (gem_has_lmem(i915)) > + expected = -ENODEV; > + > err = 0; > if (ioctl(i915, DRM_IOCTL_I915_GEM_SET_CACHING, &args)) > err = -errno; > - if (err == -ENOENT) > + if (err == expected) > store_all(i915); > errno = 0; > > close(i915); > - igt_assert_eq(err, -ENOENT); > + igt_assert_eq(err, expected); > } > > static void > -- > 2.26.3 >