diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2017-12-14 15:10:09 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2017-12-14 20:10:01 +0200 |
| commit | 8d8c46fad4a15cd8a9811ab74a14de0ee1d6c66b (patch) | |
| tree | 6638ec11ffa017b704e55de0c5f307406aeed720 /drivers/gpu/drm/i915/i915_gem_timeline.c | |
| parent | 84ef3a727e32ac32380e28198c3fdc6dcf941ec6 (diff) | |
| download | op-kernel-dev-8d8c46fad4a15cd8a9811ab74a14de0ee1d6c66b.zip op-kernel-dev-8d8c46fad4a15cd8a9811ab74a14de0ee1d6c66b.tar.gz | |
drm/i915: properly init lockdep class
The code has an ifdef and uses two functions to either init the bare
spinlock or init it and set a lock-class. It is possible to do the same
thing without an ifdef.
With this patch (in debug case) we first use the "default" lock class
which is later overwritten to the supplied one. Without lockdep the set
name/class function vanishes.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171214131009.7479-1-joonas.lahtinen@linux.intel.com
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_timeline.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_timeline.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_timeline.c b/drivers/gpu/drm/i915/i915_gem_timeline.c index c01905d..e9fd876 100644 --- a/drivers/gpu/drm/i915/i915_gem_timeline.c +++ b/drivers/gpu/drm/i915/i915_gem_timeline.c @@ -33,11 +33,8 @@ static void __intel_timeline_init(struct intel_timeline *tl, { tl->fence_context = context; tl->common = parent; -#ifdef CONFIG_DEBUG_SPINLOCK - __raw_spin_lock_init(&tl->lock.rlock, lockname, lockclass); -#else spin_lock_init(&tl->lock); -#endif + lockdep_set_class_and_name(&tl->lock, lockclass, lockname); init_request_active(&tl->last_request, NULL); INIT_LIST_HEAD(&tl->requests); i915_syncmap_init(&tl->sync); |
