diff options
Diffstat (limited to 'features/rt/drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch')
| -rw-r--r-- | features/rt/drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/features/rt/drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch b/features/rt/drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch new file mode 100644 index 00000000..e8de6823 --- /dev/null +++ b/features/rt/drm-i915-gt-Only-disable-interrupts-for-the-timeline.patch @@ -0,0 +1,51 @@ +From 0dfb9c223f7310e28f5a5384a96aa99b563e219b Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Tue, 7 Jul 2020 12:25:11 +0200 +Subject: [PATCH 159/191] drm/i915/gt: Only disable interrupts for the timeline + lock on !force-threaded + +According to commit + d67739268cf0e ("drm/i915/gt: Mark up the nested engine-pm timeline lock as irqsafe") + +the intrrupts are disabled the code may be called from an interrupt +handler and from preemptible context. +With `force_irqthreads' set the timeline mutex is never observed in IRQ +context so it is not neede to disable interrupts. + +Disable only interrupts if not in `force_irqthreads' mode. + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c +index e67d09259dd0..2a480b47dac2 100644 +--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c ++++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c +@@ -81,9 +81,10 @@ static int __engine_unpark(struct intel_wakeref *wf) + + static unsigned long __timeline_mark_lock(struct intel_context *ce) + { +- unsigned long flags; ++ unsigned long flags = 0; + +- local_irq_save(flags); ++ if (!force_irqthreads) ++ local_irq_save(flags); + mutex_acquire(&ce->timeline->mutex.dep_map, 2, 0, _THIS_IP_); + + return flags; +@@ -93,7 +94,8 @@ static void __timeline_mark_unlock(struct intel_context *ce, + unsigned long flags) + { + mutex_release(&ce->timeline->mutex.dep_map, _THIS_IP_); +- local_irq_restore(flags); ++ if (!force_irqthreads) ++ local_irq_restore(flags); + } + + #else +-- +2.19.1 + |