AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 08:56:59 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915/selftests: Fixup a missing legacy_idx

Browse Source 
Grr, missed one*. For using the legacy engine map, we should use
engine->legacy_idx. Ideally, we should know the intel_context in the
selftest and avoid all the fiddling around with unwanted GEM contexts.

* In my defence, the conflict was added in another patch after it was
tested by CI.

v2: mock engines needs legacy love as well

Fixes: f1c4d157ab ("drm/i915: Fix up the inverse mapping for default ctx->engines[]")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190808194525.9410-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-08-08 20:45:25 +01:00
parent 9749a5b6c0
commit cbb153c50e
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/gt/mock_engine.c
View File

@ -263,6 +263,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
snprintf(engine->base.name, sizeof(engine->base.name), "%s", name); snprintf(engine->base.name, sizeof(engine->base.name), "%s", name);
engine->base.id = id; engine->base.id = id;
engine->base.mask = BIT(id); engine->base.mask = BIT(id);
engine->base.instance = id;
engine->base.status_page.addr = (void *)(engine + 1); engine->base.status_page.addr = (void *)(engine + 1);
engine->base.cops = &mock_context_ops; engine->base.cops = &mock_context_ops;
@ -281,6 +282,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
timer_setup(&engine->hw_delay, hw_delay_complete, 0); timer_setup(&engine->hw_delay, hw_delay_complete, 0);
INIT_LIST_HEAD(&engine->hw_queue); INIT_LIST_HEAD(&engine->hw_queue);
intel_engine_add_user(&engine->base);
return &engine->base; return &engine->base;
} }

2
drivers/gpu/drm/i915/selftests/i915_request.c
View File

@ -339,7 +339,7 @@ static int __igt_breadcrumbs_smoketest(void *arg)
mutex_lock(BKL); mutex_lock(BKL);
ce = i915_gem_context_get_engine(ctx, t->engine->id); ce = i915_gem_context_get_engine(ctx, t->engine->legacy_idx);
GEM_BUG_ON(IS_ERR(ce)); GEM_BUG_ON(IS_ERR(ce));
rq = t->request_alloc(ce); rq = t->request_alloc(ce);
intel_context_put(ce); intel_context_put(ce);

1
drivers/gpu/drm/i915/selftests/mock_gem_device.c
View File

@ -213,6 +213,7 @@ struct drm_i915_private *mock_gem_device(void)
if (mock_engine_init(i915->engine[RCS0])) if (mock_engine_init(i915->engine[RCS0]))
goto err_context; goto err_context;
intel_engines_driver_register(i915);
mutex_unlock(&i915->drm.struct_mutex); mutex_unlock(&i915->drm.struct_mutex);
WARN_ON(i915_gemfs_init(i915)); WARN_ON(i915_gemfs_init(i915));