summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/selftests
diff options
context:
space:
mode:
authorChris Wilson2018-07-06 23:07:10 +0200
committerChris Wilson2018-07-07 09:09:43 +0200
commit890fd185d53037d05d10a0825950c4b038e39d4a (patch)
tree7f3885cd7de4e908ccb76e35a23adab8d274a1ae /drivers/gpu/drm/i915/selftests
parentdrm/i915/selftests: Avoid warning if runtime pm is disabled (diff)
downloadkernel-qcow2-linux-890fd185d53037d05d10a0825950c4b038e39d4a.tar.gz
kernel-qcow2-linux-890fd185d53037d05d10a0825950c4b038e39d4a.tar.xz
kernel-qcow2-linux-890fd185d53037d05d10a0825950c4b038e39d4a.zip
drm/i915: Replace nested subclassing with explicit subclasses
In the next patch, we will want a third distinct class of timeline that may overlap with the current pair of client and engine timeline classes. Rather than use the ad hoc markup of SINGLE_DEPTH_NESTING, initialise the different timeline classes with an explicit subclass. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180706210710.16251-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
-rw-r--r--drivers/gpu/drm/i915/selftests/mock_engine.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c
index c2a0451336cf..22a73da45ad5 100644
--- a/drivers/gpu/drm/i915/selftests/mock_engine.c
+++ b/drivers/gpu/drm/i915/selftests/mock_engine.c
@@ -200,6 +200,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
engine->base.submit_request = mock_submit_request;
i915_timeline_init(i915, &engine->base.timeline, engine->base.name);
+ lockdep_set_subclass(&engine->base.timeline.lock, TIMELINE_ENGINE);
+
intel_engine_init_breadcrumbs(&engine->base);
engine->base.breadcrumbs.mock = true; /* prevent touching HW for irqs */