From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: viswax.krishna.raveendra.talabattula@intel.com
Cc: igt-dev@lists.freedesktop.org, Mahesh.Meena@intel.com
Subject: Re: [igt-dev] [Patch V5] [i-g-t] tests/i915: test pass for no caching case
Date: Fri, 21 May 2021 00:37:37 -0700 [thread overview]
Message-ID: <87h7iwedvi.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <20210521064906.775140-1-viswax.krishna.raveendra.talabattula@intel.com>
On Thu, 20 May 2021 23:49:06 -0700, <viswax.krishna.raveendra.talabattula@intel.com> wrote:
>
> From: Viswa Krishna Raveendra Talabattula <viswax.krishna.raveendra.talabattula@intel.com>
>
> The userptr memory does not support I915_CACHING_NONE(no caching) level
> as per the below commit related to i915 in the kernel
>
> commit 02b64a4a0cb14e414b0be3b7261edc4fabfc0e2c
> Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Date: Tue Mar 23 16:50:02 2021 +0100
>
> drm/i915: Reject more ioctls for userptr, v2.
>
> So lets make test pass for return value of -ENXIO and 0
> Print warning of "Deprecated userptr SET_CACHING behavior" for older
> kernels
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> Signed-off-by: Viswa Krishna Raveendra Talabattula <viswax.krishna.raveendra.talabattula@intel.com>
> ---
> tests/i915/gem_userptr_blits.c | 33 ++++++++++++++++++++++++++++-----
> 1 file changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
> index aad5f141..2814e3c3 100644
> --- a/tests/i915/gem_userptr_blits.c
> +++ b/tests/i915/gem_userptr_blits.c
> @@ -2016,6 +2016,7 @@ static void test_set_caching(int i915)
> };
> uint32_t handle;
> void *page;
> + int ret;
>
> page = mmap(NULL, 4096, PROT_READ | PROT_WRITE,
> MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
> @@ -2032,15 +2033,37 @@ 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);
> + ret = __gem_set_caching(i915, handle, levels[idx]);
> + if (levels[idx] == I915_CACHING_NONE) {
> + if(ret != 0)
> + igt_assert_eq(ret, -ENXIO);
> + else
> + igt_warn("Deprecated userptr SET_CACHING behavior\n");
> + } else {
> + igt_assert_eq(ret, 0);
> + }
> gem_close(i915, handle);
> }
>
> gem_userptr(i915, page, 4096, 0, 0, &handle);
> - for (int idx = 0; idx < ARRAY_SIZE(levels); idx++)
> - igt_assert_eq(__gem_set_caching(i915, handle, levels[idx]), 0);
> - for (int idx = 0; idx < ARRAY_SIZE(levels); idx++)
> - igt_assert_eq(__gem_set_caching(i915, handle, levels[idx]), 0);
> + for (int idx = 0; idx < ARRAY_SIZE(levels); idx++) {
> + ret = __gem_set_caching(i915, handle, levels[idx]);
> + if (levels[idx] == I915_CACHING_NONE) {
> + if (ret != 0)
> + igt_assert_eq(ret, -ENXIO);
> + } else {
> + igt_assert_eq(ret, 0);
> + }
> + }
> + for (int idx = 0; idx < ARRAY_SIZE(levels); idx++) {
> + ret = __gem_set_caching(i915, handle, levels[idx]);
> + if (levels[idx] == I915_CACHING_NONE) {
> + if (ret != 0)
> + igt_assert_eq(ret, -ENXIO);
> + } else {
> + igt_assert_eq(ret, 0);
> + }
> + }
> gem_close(i915, handle);
>
> munmap(page, 4096);
> --
> 2.30.0
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-05-21 7:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 6:49 [igt-dev] [Patch V5] [i-g-t] tests/i915: test pass for no caching case viswax.krishna.raveendra.talabattula
2021-05-21 7:37 ` Dixit, Ashutosh [this message]
2021-05-21 8:49 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/i915: test pass for no caching case (rev4) Patchwork
2021-05-23 3:43 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h7iwedvi.wl-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=Mahesh.Meena@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=viswax.krishna.raveendra.talabattula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox