Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes: > In the initial selftest, we didn't care what the engine->id was, just > that it could uniquely identify it. Later though, we started tracking in > the fixed size arrays around the drm_i915_private and so we now require > it to be appropriate. This becomes an issue when using the standalone > harness of running all available tests at module load as we quickly > assign an out-of-bounds index to an engine as repeatedly reallocate the > mock GEM device (and doesn't show up in igt/drv_selftest as that ran > each subtest individually). > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102045 > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> > --- > drivers/gpu/drm/i915/selftests/mock_engine.c | 8 +++++--- > drivers/gpu/drm/i915/selftests/mock_engine.h | 3 ++- > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c > index 5b18a2dc19a8..fc0fd7498689 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_engine.c > +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c > @@ -123,10 +123,12 @@ static struct intel_ring *mock_ring(struct intel_engine_cs *engine) > } > > struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > - const char *name) > + const char *name, > + int id) > { > struct mock_engine *engine; > - static int id; > + > + GEM_BUG_ON(id >= I915_NUM_ENGINES); > > engine = kzalloc(sizeof(*engine) + PAGE_SIZE, GFP_KERNEL); > if (!engine) > @@ -141,7 +143,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > /* minimal engine setup for requests */ > engine->base.i915 = i915; > snprintf(engine->base.name, sizeof(engine->base.name), "%s", name); > - engine->base.id = id++; > + engine->base.id = id; > engine->base.status_page.page_addr = (void *)(engine + 1); > > engine->base.context_pin = mock_context_pin; > diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.h b/drivers/gpu/drm/i915/selftests/mock_engine.h > index e5e240216ba3..133d0c21790d 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_engine.h > +++ b/drivers/gpu/drm/i915/selftests/mock_engine.h > @@ -40,7 +40,8 @@ struct mock_engine { > }; > > struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > - const char *name); > + const char *name, > + int id); > void mock_engine_flush(struct intel_engine_cs *engine); > void mock_engine_reset(struct intel_engine_cs *engine); > void mock_engine_free(struct intel_engine_cs *engine); > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > index ec92b6569b50..678723430d78 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > @@ -226,7 +226,7 @@ struct drm_i915_private *mock_gem_device(void) > mutex_unlock(&i915->drm.struct_mutex); > > mkwrite_device_info(i915)->ring_mask = BIT(0); > - i915->engine[RCS] = mock_engine(i915, "mock"); > + i915->engine[RCS] = mock_engine(i915, "mock", RCS); > if (!i915->engine[RCS]) > goto err_priorities; > > -- > 2.13.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
