From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 857676F570 for ; Thu, 20 May 2021 23:02:42 +0000 (UTC) Date: Thu, 20 May 2021 16:01:25 -0700 Message-ID: <87o8d5dn7e.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" In-Reply-To: <20210520094041.771946-1-viswax.krishna.raveendra.talabattula@intel.com> References: <20210520094041.771946-1-viswax.krishna.raveendra.talabattula@intel.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Subject: Re: [igt-dev] [Patch V3] [i-g-t] tests/i915: test pass for no caching case List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: viswax.krishna.raveendra.talabattula@intel.com Cc: igt-dev@lists.freedesktop.org, Mahesh.Meena@intel.com List-ID: On Thu, 20 May 2021 02:40:41 -0700, wrote: Your commit description is good! > diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c > index aad5f141..a90bcbfa 100644 > --- a/tests/i915/gem_userptr_blits.c > +++ b/tests/i915/gem_userptr_blits.c > @@ -2032,15 +2032,35 @@ static void test_set_caching(int i915) > > for (int idx = 0; idx < ARRAY_SIZE(levels); idx++) { > gem_userptr(i915, page, 4096, 0, 0, &handle); > - igt_assert_eq(__gem_set_caching(i915, handle, levels[idx]), 0); > + if (levels[idx] == I915_CACHING_CACHED) > + igt_assert_eq(__gem_set_caching(i915, handle, levels[idx]), 0); > + else > + if (__gem_set_caching(i915, handle, levels[idx]) == 0) > + igt_warn("Deprecated return code 0 from __gem_set_caching\n"); > + else > + igt_assert_eq(__gem_set_caching(i915, handle, levels[idx]), -ENXIO); The logic is now correct. However, I still don't like __gem_set_caching being called a second time here. How about something like this (in all 3 places): int ret; ret = __gem_set_caching(i915, handle, levels[idx]); if (levels[idx] == I915_CACHING_NONE) ret != 0 ? igt_assert_eq(ret, -ENXIO) : igt_warn("Deprecated userptr SET_CACHING behavior\n"); else igt_assert_eq(ret, 0); Hopefully the conditional statement works ;) otherwise change to if-else. _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev