From 8ed59c9195ce6fd338916b39155b738c557d0cab Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Sun, 14 Jul 2019 16:42:21 -0500 Subject: [PATCH 1/2] i915: avoid calling lockdep_assert_irqs_disabled on PREEMPT_RT_FULL The PREEMPT_RT_FULL patchset keeps irqs enabled when operating on spin_locks. Avoid this lockdep call on RT since in most cases it will fail and WARN unnessesarily. Signed-off-by: Clark Williams --- drivers/gpu/drm/i915/intel_breadcrumbs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index 832cb6b1e9bd..3eef6010ebf6 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -101,7 +101,8 @@ __dma_fence_signal__notify(struct dma_fence *fence) struct dma_fence_cb *cur, *tmp; lockdep_assert_held(fence->lock); - lockdep_assert_irqs_disabled(); + if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) + lockdep_assert_irqs_disabled(); list_for_each_entry_safe(cur, tmp, &fence->cb_list, node) { INIT_LIST_HEAD(&cur->node); @@ -276,7 +277,8 @@ void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine) bool i915_request_enable_breadcrumb(struct i915_request *rq) { lockdep_assert_held(&rq->lock); - lockdep_assert_irqs_disabled(); + if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) + lockdep_assert_irqs_disabled(); if (test_bit(I915_FENCE_FLAG_ACTIVE, &rq->fence.flags)) { struct intel_breadcrumbs *b = &rq->engine->breadcrumbs; @@ -325,7 +327,8 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq) struct intel_breadcrumbs *b = &rq->engine->breadcrumbs; lockdep_assert_held(&rq->lock); - lockdep_assert_irqs_disabled(); + if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) + lockdep_assert_irqs_disabled(); /* * We must wait for b->irq_lock so that we know the interrupt handler -- 2.21.0