The busyness implementation for guc is incompatible with PMU,
so disable it to prevent upsetting lockdep.

Signed-off-by: Maarten Lankhorst <[email protected]>
---
 drivers/gpu/drm/i915/i915_pmu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 65771e54b9b51..f8bea3ec458d9 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -554,6 +554,9 @@ engine_event_status(struct intel_engine_cs *engine,
 {
        switch (sample) {
        case I915_SAMPLE_BUSY:
+               /* The guc submission engine->busyness() callback has issues 
with CONFIG_PREEMPT_RT */
+               if (CONFIG_ENABLED(CONFIG_PREEMPT_RT) && 
intel_uc_uses_guc_submission(engine->gt->uc))
+                       return -ENODEV;
        case I915_SAMPLE_WAIT:
                break;
        case I915_SAMPLE_SEMA:
-- 
2.53.0

Reply via email to