From: Rodrigo Vivi <rodrigo.vivi@intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "DRI Development" <dri-devel@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@intel.com>, "Jon Bloomfield" <jon.bloomfield@intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Matthew Auld" <matthew.auld@intel.com>, "Lionel Landwerlin" <lionel.g.landwerlin@intel.com>, "Dave Airlie" <airlied@redhat.com>, "Jason Ekstrand" <jason@jlekstrand.net> Subject: Re: [PATCH] drm/i915: Actually delete gpu reloc selftests Date: Fri, 20 Aug 2021 12:59:56 -0400 [thread overview] Message-ID: <YR/fjM7fDbMHZh5b@intel.com> (raw) In-Reply-To: <20210820154932.296628-1-daniel.vetter@ffwll.ch> On Fri, Aug 20, 2021 at 05:49:32PM +0200, Daniel Vetter wrote: > In > > commit 8e02cceb1f1f4f254625e5338dd997ff61ab40d7 > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Tue Aug 3 14:48:33 2021 +0200 > > drm/i915: delete gpu reloc code it would be better with dim cite format... do we need the Fixes: tag? anyway: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > I deleted the gpu relocation code and the selftest include and > enabling, but accidentally forgot about the selftest source code. > > Fix this oversight. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Jon Bloomfield <jon.bloomfield@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Jason Ekstrand <jason@jlekstrand.net> > --- > .../i915/gem/selftests/i915_gem_execbuffer.c | 190 ------------------ > 1 file changed, 190 deletions(-) > delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > deleted file mode 100644 > index 16162fc2782d..000000000000 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > +++ /dev/null > @@ -1,190 +0,0 @@ > -// SPDX-License-Identifier: MIT > -/* > - * Copyright © 2020 Intel Corporation > - */ > - > -#include "i915_selftest.h" > - > -#include "gt/intel_engine_pm.h" > -#include "selftests/igt_flush_test.h" > - > -static u64 read_reloc(const u32 *map, int x, const u64 mask) > -{ > - u64 reloc; > - > - memcpy(&reloc, &map[x], sizeof(reloc)); > - return reloc & mask; > -} > - > -static int __igt_gpu_reloc(struct i915_execbuffer *eb, > - struct drm_i915_gem_object *obj) > -{ > - const unsigned int offsets[] = { 8, 3, 0 }; > - const u64 mask = > - GENMASK_ULL(eb->reloc_cache.use_64bit_reloc ? 63 : 31, 0); > - const u32 *map = page_mask_bits(obj->mm.mapping); > - struct i915_request *rq; > - struct i915_vma *vma; > - int err; > - int i; > - > - vma = i915_vma_instance(obj, eb->context->vm, NULL); > - if (IS_ERR(vma)) > - return PTR_ERR(vma); > - > - err = i915_gem_object_lock(obj, &eb->ww); > - if (err) > - return err; > - > - err = i915_vma_pin_ww(vma, &eb->ww, 0, 0, PIN_USER | PIN_HIGH); > - if (err) > - return err; > - > - /* 8-Byte aligned */ > - err = __reloc_entry_gpu(eb, vma, offsets[0] * sizeof(u32), 0); > - if (err <= 0) > - goto reloc_err; > - > - /* !8-Byte aligned */ > - err = __reloc_entry_gpu(eb, vma, offsets[1] * sizeof(u32), 1); > - if (err <= 0) > - goto reloc_err; > - > - /* Skip to the end of the cmd page */ > - i = PAGE_SIZE / sizeof(u32) - 1; > - i -= eb->reloc_cache.rq_size; > - memset32(eb->reloc_cache.rq_cmd + eb->reloc_cache.rq_size, > - MI_NOOP, i); > - eb->reloc_cache.rq_size += i; > - > - /* Force next batch */ > - err = __reloc_entry_gpu(eb, vma, offsets[2] * sizeof(u32), 2); > - if (err <= 0) > - goto reloc_err; > - > - GEM_BUG_ON(!eb->reloc_cache.rq); > - rq = i915_request_get(eb->reloc_cache.rq); > - reloc_gpu_flush(eb, &eb->reloc_cache); > - GEM_BUG_ON(eb->reloc_cache.rq); > - > - err = i915_gem_object_wait(obj, I915_WAIT_INTERRUPTIBLE, HZ / 2); > - if (err) { > - intel_gt_set_wedged(eb->engine->gt); > - goto put_rq; > - } > - > - if (!i915_request_completed(rq)) { > - pr_err("%s: did not wait for relocations!\n", eb->engine->name); > - err = -EINVAL; > - goto put_rq; > - } > - > - for (i = 0; i < ARRAY_SIZE(offsets); i++) { > - u64 reloc = read_reloc(map, offsets[i], mask); > - > - if (reloc != i) { > - pr_err("%s[%d]: map[%d] %llx != %x\n", > - eb->engine->name, i, offsets[i], reloc, i); > - err = -EINVAL; > - } > - } > - if (err) > - igt_hexdump(map, 4096); > - > -put_rq: > - i915_request_put(rq); > -unpin_vma: > - i915_vma_unpin(vma); > - return err; > - > -reloc_err: > - if (!err) > - err = -EIO; > - goto unpin_vma; > -} > - > -static int igt_gpu_reloc(void *arg) > -{ > - struct i915_execbuffer eb; > - struct drm_i915_gem_object *scratch; > - int err = 0; > - u32 *map; > - > - eb.i915 = arg; > - > - scratch = i915_gem_object_create_internal(eb.i915, 4096); > - if (IS_ERR(scratch)) > - return PTR_ERR(scratch); > - > - map = i915_gem_object_pin_map_unlocked(scratch, I915_MAP_WC); > - if (IS_ERR(map)) { > - err = PTR_ERR(map); > - goto err_scratch; > - } > - > - intel_gt_pm_get(&eb.i915->gt); > - > - for_each_uabi_engine(eb.engine, eb.i915) { > - if (intel_engine_requires_cmd_parser(eb.engine) || > - intel_engine_using_cmd_parser(eb.engine)) > - continue; > - > - reloc_cache_init(&eb.reloc_cache, eb.i915); > - memset(map, POISON_INUSE, 4096); > - > - intel_engine_pm_get(eb.engine); > - eb.context = intel_context_create(eb.engine); > - if (IS_ERR(eb.context)) { > - err = PTR_ERR(eb.context); > - goto err_pm; > - } > - eb.reloc_pool = NULL; > - eb.reloc_context = NULL; > - > - i915_gem_ww_ctx_init(&eb.ww, false); > -retry: > - err = intel_context_pin_ww(eb.context, &eb.ww); > - if (!err) { > - err = __igt_gpu_reloc(&eb, scratch); > - > - intel_context_unpin(eb.context); > - } > - if (err == -EDEADLK) { > - err = i915_gem_ww_ctx_backoff(&eb.ww); > - if (!err) > - goto retry; > - } > - i915_gem_ww_ctx_fini(&eb.ww); > - > - if (eb.reloc_pool) > - intel_gt_buffer_pool_put(eb.reloc_pool); > - if (eb.reloc_context) > - intel_context_put(eb.reloc_context); > - > - intel_context_put(eb.context); > -err_pm: > - intel_engine_pm_put(eb.engine); > - if (err) > - break; > - } > - > - if (igt_flush_test(eb.i915)) > - err = -EIO; > - > - intel_gt_pm_put(&eb.i915->gt); > -err_scratch: > - i915_gem_object_put(scratch); > - return err; > -} > - > -int i915_gem_execbuffer_live_selftests(struct drm_i915_private *i915) > -{ > - static const struct i915_subtest tests[] = { > - SUBTEST(igt_gpu_reloc), > - }; > - > - if (intel_gt_is_wedged(&i915->gt)) > - return 0; > - > - return i915_live_subtests(tests, i915); > -} > -- > 2.32.0 >
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com> To: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "DRI Development" <dri-devel@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@intel.com>, "Jon Bloomfield" <jon.bloomfield@intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Matthew Auld" <matthew.auld@intel.com>, "Lionel Landwerlin" <lionel.g.landwerlin@intel.com>, "Dave Airlie" <airlied@redhat.com>, "Jason Ekstrand" <jason@jlekstrand.net> Subject: Re: [Intel-gfx] [PATCH] drm/i915: Actually delete gpu reloc selftests Date: Fri, 20 Aug 2021 12:59:56 -0400 [thread overview] Message-ID: <YR/fjM7fDbMHZh5b@intel.com> (raw) In-Reply-To: <20210820154932.296628-1-daniel.vetter@ffwll.ch> On Fri, Aug 20, 2021 at 05:49:32PM +0200, Daniel Vetter wrote: > In > > commit 8e02cceb1f1f4f254625e5338dd997ff61ab40d7 > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Tue Aug 3 14:48:33 2021 +0200 > > drm/i915: delete gpu reloc code it would be better with dim cite format... do we need the Fixes: tag? anyway: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > I deleted the gpu relocation code and the selftest include and > enabling, but accidentally forgot about the selftest source code. > > Fix this oversight. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Jon Bloomfield <jon.bloomfield@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Jason Ekstrand <jason@jlekstrand.net> > --- > .../i915/gem/selftests/i915_gem_execbuffer.c | 190 ------------------ > 1 file changed, 190 deletions(-) > delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > deleted file mode 100644 > index 16162fc2782d..000000000000 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c > +++ /dev/null > @@ -1,190 +0,0 @@ > -// SPDX-License-Identifier: MIT > -/* > - * Copyright © 2020 Intel Corporation > - */ > - > -#include "i915_selftest.h" > - > -#include "gt/intel_engine_pm.h" > -#include "selftests/igt_flush_test.h" > - > -static u64 read_reloc(const u32 *map, int x, const u64 mask) > -{ > - u64 reloc; > - > - memcpy(&reloc, &map[x], sizeof(reloc)); > - return reloc & mask; > -} > - > -static int __igt_gpu_reloc(struct i915_execbuffer *eb, > - struct drm_i915_gem_object *obj) > -{ > - const unsigned int offsets[] = { 8, 3, 0 }; > - const u64 mask = > - GENMASK_ULL(eb->reloc_cache.use_64bit_reloc ? 63 : 31, 0); > - const u32 *map = page_mask_bits(obj->mm.mapping); > - struct i915_request *rq; > - struct i915_vma *vma; > - int err; > - int i; > - > - vma = i915_vma_instance(obj, eb->context->vm, NULL); > - if (IS_ERR(vma)) > - return PTR_ERR(vma); > - > - err = i915_gem_object_lock(obj, &eb->ww); > - if (err) > - return err; > - > - err = i915_vma_pin_ww(vma, &eb->ww, 0, 0, PIN_USER | PIN_HIGH); > - if (err) > - return err; > - > - /* 8-Byte aligned */ > - err = __reloc_entry_gpu(eb, vma, offsets[0] * sizeof(u32), 0); > - if (err <= 0) > - goto reloc_err; > - > - /* !8-Byte aligned */ > - err = __reloc_entry_gpu(eb, vma, offsets[1] * sizeof(u32), 1); > - if (err <= 0) > - goto reloc_err; > - > - /* Skip to the end of the cmd page */ > - i = PAGE_SIZE / sizeof(u32) - 1; > - i -= eb->reloc_cache.rq_size; > - memset32(eb->reloc_cache.rq_cmd + eb->reloc_cache.rq_size, > - MI_NOOP, i); > - eb->reloc_cache.rq_size += i; > - > - /* Force next batch */ > - err = __reloc_entry_gpu(eb, vma, offsets[2] * sizeof(u32), 2); > - if (err <= 0) > - goto reloc_err; > - > - GEM_BUG_ON(!eb->reloc_cache.rq); > - rq = i915_request_get(eb->reloc_cache.rq); > - reloc_gpu_flush(eb, &eb->reloc_cache); > - GEM_BUG_ON(eb->reloc_cache.rq); > - > - err = i915_gem_object_wait(obj, I915_WAIT_INTERRUPTIBLE, HZ / 2); > - if (err) { > - intel_gt_set_wedged(eb->engine->gt); > - goto put_rq; > - } > - > - if (!i915_request_completed(rq)) { > - pr_err("%s: did not wait for relocations!\n", eb->engine->name); > - err = -EINVAL; > - goto put_rq; > - } > - > - for (i = 0; i < ARRAY_SIZE(offsets); i++) { > - u64 reloc = read_reloc(map, offsets[i], mask); > - > - if (reloc != i) { > - pr_err("%s[%d]: map[%d] %llx != %x\n", > - eb->engine->name, i, offsets[i], reloc, i); > - err = -EINVAL; > - } > - } > - if (err) > - igt_hexdump(map, 4096); > - > -put_rq: > - i915_request_put(rq); > -unpin_vma: > - i915_vma_unpin(vma); > - return err; > - > -reloc_err: > - if (!err) > - err = -EIO; > - goto unpin_vma; > -} > - > -static int igt_gpu_reloc(void *arg) > -{ > - struct i915_execbuffer eb; > - struct drm_i915_gem_object *scratch; > - int err = 0; > - u32 *map; > - > - eb.i915 = arg; > - > - scratch = i915_gem_object_create_internal(eb.i915, 4096); > - if (IS_ERR(scratch)) > - return PTR_ERR(scratch); > - > - map = i915_gem_object_pin_map_unlocked(scratch, I915_MAP_WC); > - if (IS_ERR(map)) { > - err = PTR_ERR(map); > - goto err_scratch; > - } > - > - intel_gt_pm_get(&eb.i915->gt); > - > - for_each_uabi_engine(eb.engine, eb.i915) { > - if (intel_engine_requires_cmd_parser(eb.engine) || > - intel_engine_using_cmd_parser(eb.engine)) > - continue; > - > - reloc_cache_init(&eb.reloc_cache, eb.i915); > - memset(map, POISON_INUSE, 4096); > - > - intel_engine_pm_get(eb.engine); > - eb.context = intel_context_create(eb.engine); > - if (IS_ERR(eb.context)) { > - err = PTR_ERR(eb.context); > - goto err_pm; > - } > - eb.reloc_pool = NULL; > - eb.reloc_context = NULL; > - > - i915_gem_ww_ctx_init(&eb.ww, false); > -retry: > - err = intel_context_pin_ww(eb.context, &eb.ww); > - if (!err) { > - err = __igt_gpu_reloc(&eb, scratch); > - > - intel_context_unpin(eb.context); > - } > - if (err == -EDEADLK) { > - err = i915_gem_ww_ctx_backoff(&eb.ww); > - if (!err) > - goto retry; > - } > - i915_gem_ww_ctx_fini(&eb.ww); > - > - if (eb.reloc_pool) > - intel_gt_buffer_pool_put(eb.reloc_pool); > - if (eb.reloc_context) > - intel_context_put(eb.reloc_context); > - > - intel_context_put(eb.context); > -err_pm: > - intel_engine_pm_put(eb.engine); > - if (err) > - break; > - } > - > - if (igt_flush_test(eb.i915)) > - err = -EIO; > - > - intel_gt_pm_put(&eb.i915->gt); > -err_scratch: > - i915_gem_object_put(scratch); > - return err; > -} > - > -int i915_gem_execbuffer_live_selftests(struct drm_i915_private *i915) > -{ > - static const struct i915_subtest tests[] = { > - SUBTEST(igt_gpu_reloc), > - }; > - > - if (intel_gt_is_wedged(&i915->gt)) > - return 0; > - > - return i915_live_subtests(tests, i915); > -} > -- > 2.32.0 >
next prev parent reply other threads:[~2021-08-20 17:00 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-20 15:49 [PATCH] drm/i915: Actually delete gpu reloc selftests Daniel Vetter 2021-08-20 15:49 ` [Intel-gfx] " Daniel Vetter 2021-08-20 16:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2021-08-20 16:44 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-08-20 16:59 ` Rodrigo Vivi [this message] 2021-08-20 16:59 ` [Intel-gfx] [PATCH] " Rodrigo Vivi 2021-08-20 17:59 ` Daniel Vetter 2021-08-20 17:59 ` [Intel-gfx] " Daniel Vetter 2021-08-27 8:13 ` Daniel Vetter 2021-08-27 8:13 ` [Intel-gfx] " Daniel Vetter 2021-08-27 16:08 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2021-08-27 19:59 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=YR/fjM7fDbMHZh5b@intel.com \ --to=rodrigo.vivi@intel.com \ --cc=airlied@redhat.com \ --cc=chris@chris-wilson.co.uk \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jason@jlekstrand.net \ --cc=jon.bloomfield@intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=lionel.g.landwerlin@intel.com \ --cc=maarten.lankhorst@linux.intel.com \ --cc=matthew.auld@intel.com \ --cc=thomas.hellstrom@linux.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.