i915 fixups for lockdep/lockdebugging
Subsystems (2)
cover i915 fixups for lockdep/lockdebugging
From: Clark Williams <[email protected]>
The i915 driver was throwing splats on my home test box running v5.2-rt3 when I turned on lockdep and lock debugging configs. This was mainly due to the non-side effects of the spin*_irq*() macros which do nothing to IRQs on PREEMPT_RT. Converting the various irq_lock spinlocks and the uncore lock to be raw_spinlock_t fixes this, although I'm not sure of the performance implications for latency spikes.
Testing was done on an Intel NUC with the following graphics:
00:02.0 VGA compatible controller: Intel Corporation Iris Plus Graphics 650 (rev 06)
Testing on other variants of i915 would be appreciated.
Clark Williams (3):
i915: do not call lockdep_assert_irqs_disabled() on PREEMPT_RT
i915: convert all irq_locks spinlocks to raw spinlocks
i915: convert uncore lock to raw spinlock
drivers/gpu/drm/i915/i915_debugfs.c | 8 +- drivers/gpu/drm/i915/i915_drv.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 154 ++++++++++----------- drivers/gpu/drm/i915/i915_pmu.c | 4 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 51 +++---- drivers/gpu/drm/i915/intel_display.c | 20 +-- drivers/gpu/drm/i915/intel_engine_cs.c | 4 +- drivers/gpu/drm/i915/intel_engine_types.h | 2 +- drivers/gpu/drm/i915/intel_fifo_underrun.c | 16 +-- drivers/gpu/drm/i915/intel_guc.c | 6 +- drivers/gpu/drm/i915/intel_guc.h | 10 +- drivers/gpu/drm/i915/intel_hotplug.c | 36 ++--- drivers/gpu/drm/i915/intel_pm.c | 8 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 8 +- drivers/gpu/drm/i915/intel_sprite.c | 32 ++--- drivers/gpu/drm/i915/intel_tv.c | 8 +- drivers/gpu/drm/i915/intel_uncore.c | 52 +++---- drivers/gpu/drm/i915/intel_uncore.h | 2 +- drivers/gpu/drm/i915/intel_workarounds.c | 4 +- 21 files changed, 220 insertions(+), 217 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/3 i915: do not call lockdep_assert_irqs_disabled() on PREEMPT_RT
From: Clark Williams <[email protected]>
The 'breadcrumb' code in the i915 driver calls lockdep_assert_irqs_disabled() when starting some operations. This is valid on a stock kernel but on a PREEMPT_RT kernel the spin_lock_irq*() calls to not disable interrupts and likewise the spin_unlock_irq*() calls to not enable interrupts.
Conditionalize these calls based on whether PREEMPT_RT_FULL is enabled.
--- drivers/gpu/drm/i915/intel_breadcrumbs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_breadcrumbs.c +6 -3
@@ -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
Signature · 1 line
2.21.0
Re: [PREEMPT_RT PATCH 1/3] i915: do not call lockdep_assert_irqs_disabled() on PREEMPT_RT
Quoted 19 lines · Clark Williams
From: Clark Williams <[email protected]>
The 'breadcrumb' code in the i915 driver calls
lockdep_assert_irqs_disabled()when starting some operations. This is valid on a stock kernel but on aPREEMPT_RTkernel the spin_lock_irq*() calls to not disable interrupts and likewise the spin_unlock_irq*() calls to not enable interrupts.Conditionalize these calls based on whether
PREEMPT_RT_FULLis enabled.Signed-off-by Clark Williams <[email protected]>--- drivers/gpu/drm/i915/intel_breadcrumbs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_breadcrumbs.c +0
-0
drivers/gpu/drm/i915/intel_breadcrumbs.c __dma_fence_signal__notify(struct dma_fence *fence) · line 106
Quoted 7 lines
drivers/gpu/drm/i915/intel_breadcrumbs.c +2
-1@@ -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 ();
Both asserts went in commit c36beba6b296b ("drm/i915: Seal races between async GPU cancellation, retirement and signaling"). It looks like its purpose is to ensure that ->lock is acquired and that interrupts are also disabled because that lock is always acquired with disabled interrupts. This isn't required, lockdep is clever enough to yell at you if you manage to use it wrong.
Let me drop that lockdep_assert_irqs_disabled().
Sebastian
PATCH 2/3 i915: convert all irq_locks spinlocks to raw spinlocks
In reply to Clark WilliamsFrom: Clark Williams <[email protected]>
The following structures contain a member named 'irq_lock'. These three locks are of type spinlock_t and are used in multiple contexts including atomic:
struct drm_i915_private
struct intel_breadcrumbs
strict intel_guc
Convert them all to be raw_spinlock_t so that lockdep and the lock debugging code will be happy.
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 +- drivers/gpu/drm/i915/i915_drv.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_irq.c | 142 ++++++++++----------- drivers/gpu/drm/i915/intel_breadcrumbs.c | 42 +++--- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_engine_types.h | 2 +- drivers/gpu/drm/i915/intel_fifo_underrun.c | 16 +-- drivers/gpu/drm/i915/intel_guc.c | 6 +- drivers/gpu/drm/i915/intel_guc.h | 10 +- drivers/gpu/drm/i915/intel_hotplug.c | 36 +++--- drivers/gpu/drm/i915/intel_runtime_pm.c | 8 +- drivers/gpu/drm/i915/intel_tv.c | 8 +- 13 files changed, 145 insertions(+), 145 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -4336,12 +4336,12 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,else DRM_DEBUG_KMS ("Disabling HPD storm detection\n" ); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); hotplug->hpd_storm_threshold = new_threshold;/* Reset the HPD storm stats so we don't accidentally trigger a storm */ for_each_hpd_pin (i) hotplug->stats[i].count =0 ; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);/* Re-enable hpd immediately if we were in an irq storm */ flush_delayed_work (&dev_priv->hotplug.reenable_work);
@@ -4414,12 +4414,12 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,DRM_DEBUG_KMS ("%sabling HPD short storm detection\n" , new_state ?"En" :"Dis" ); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); hotplug->hpd_short_storm_enabled = new_state;/* Reset the HPD storm stats so we don't accidentally trigger a storm */ for_each_hpd_pin (i) hotplug->stats[i].count =0 ; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);/* Re-enable hpd immediately if we were in an irq storm */ flush_delayed_work (&dev_priv->hotplug.reenable_work);
drivers/gpu/drm/i915/i915_drv.c +3 -3
@@ -879,7 +879,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv)intel_uncore_init_early (&dev_priv->uncore); -spin_lock_init (&dev_priv->irq_lock); +raw_spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);mutex_init (&dev_priv->backlight_lock);
@@ -2219,10 +2219,10 @@ static int i915_drm_resume(struct drm_device *dev)intel_modeset_init_hw (dev);intel_init_clock_gating (dev_priv); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);if (dev_priv->display.hpd_irq_setup) dev_priv->display.hpd_irq_setup (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);intel_dp_mst_resume (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1552,7 +1552,7 @@ struct drm_i915_private {struct resource mch_res;/* protects the irq masks */ -spinlock_t irq_lock; +raw_spinlock_t irq_lock;bool display_irqs_enabled;
drivers/gpu/drm/i915/i915_irq.c +71 -71
451 lines not on this page · raw message
drivers/gpu/drm/i915/intel_breadcrumbs.c +21 -21
146 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -3979,10 +3979,10 @@ void intel_finish_reset(struct drm_i915_private *dev_priv)intel_modeset_init_hw (dev);intel_init_clock_gating (dev_priv); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);if (dev_priv->display.hpd_irq_setup) dev_priv->display.hpd_irq_setup (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); ret =__intel_display_resume (dev, state, ctx);if (ret)
drivers/gpu/drm/i915/intel_engine_types.h +1 -1
@@ -307,7 +307,7 @@ struct intel_engine_cs {* the overhead of waking that client is much preferred. */ struct intel_breadcrumbs { -spinlock_t irq_lock; +raw_spinlock_t irq_lock;struct list_head signalers;struct irq_work irq_work;/* for use from inside irq_lock */
drivers/gpu/drm/i915/intel_fifo_underrun.c +8 -8
@@ -293,10 +293,10 @@ bool intel_set_cpu_fifo_underrun_reporting(struct drm_i915_private *dev_priv,unsigned long flags;bool ret; -spin_lock_irqsave (&dev_priv->irq_lock, flags); +raw_spin_lock_irqsave (&dev_priv->irq_lock, flags); ret =__intel_set_cpu_fifo_underrun_reporting (&dev_priv->drm, pipe, enable); -spin_unlock_irqrestore (&dev_priv->irq_lock, flags); +raw_spin_unlock_irqrestore (&dev_priv->irq_lock, flags);return ret; }
@@ -333,7 +333,7 @@ bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv,* crtc on LPT won't cause issues. */ -spin_lock_irqsave (&dev_priv->irq_lock, flags); +raw_spin_lock_irqsave (&dev_priv->irq_lock, flags); old = !crtc->pch_fifo_underrun_disabled; crtc->pch_fifo_underrun_disabled = !enable;
@@ -347,7 +347,7 @@ bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv, pch_transcoder, enable, old); -spin_unlock_irqrestore (&dev_priv->irq_lock, flags); +raw_spin_unlock_irqrestore (&dev_priv->irq_lock, flags);return old; }
@@ -416,7 +416,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv) {struct intel_crtc *crtc; -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);for_each_intel_crtc (&dev_priv->drm, crtc) {if (crtc->cpu_fifo_underrun_disabled)
@@ -428,7 +428,7 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv)ivybridge_check_fifo_underruns (crtc); } -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); }/**
@@ -443,7 +443,7 @@ void intel_check_pch_fifo_underruns(struct drm_i915_private *dev_priv) {struct intel_crtc *crtc; -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);for_each_intel_crtc (&dev_priv->drm, crtc) {if (crtc->pch_fifo_underrun_disabled)
@@ -453,5 +453,5 @@ void intel_check_pch_fifo_underruns(struct drm_i915_private *dev_priv)cpt_check_pch_fifo_underruns (crtc); } -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); }
drivers/gpu/drm/i915/intel_guc.c +3 -3
@@ -68,7 +68,7 @@ void intel_guc_init_early(struct intel_guc *guc)intel_guc_log_init_early (&guc->log);mutex_init (&guc->send_mutex); -spin_lock_init (&guc->irq_lock); +raw_spin_lock_init (&guc->irq_lock); guc->send = intel_guc_send_nop; guc->handler = intel_guc_to_host_event_handler_nop; guc->notify = gen8_guc_raise_irq;
@@ -478,11 +478,11 @@ void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc)* clears out the bit on handling the 1st interrupt. */ disable_rpm_wakeref_asserts (dev_priv); -spin_lock (&guc->irq_lock); +raw_spin_lock (&guc->irq_lock); val =I915_READ (SOFT_SCRATCH (15 )); msg = val & guc->msg_enabled_mask;I915_WRITE (SOFT_SCRATCH (15 ), val & ~msg); -spin_unlock (&guc->irq_lock); +raw_spin_unlock (&guc->irq_lock);enable_rpm_wakeref_asserts (dev_priv);intel_guc_to_host_process_recv_msg (guc, &msg,1 );
drivers/gpu/drm/i915/intel_guc.h +5 -5
@@ -54,7 +54,7 @@ struct intel_guc {struct drm_i915_gem_object *load_err_log;/* intel_guc_recv interrupt related state */ -spinlock_t irq_lock; +raw_spinlock_t irq_lock;bool interrupts_enabled;unsigned int msg_enabled_mask;
@@ -182,16 +182,16 @@ static inline int intel_guc_sanitize(struct intel_guc *guc)static inline void intel_guc_enable_msg (struct intel_guc *guc,u32 mask) { -spin_lock_irq (&guc->irq_lock); +raw_spin_lock_irq (&guc->irq_lock); guc->msg_enabled_mask |= mask; -spin_unlock_irq (&guc->irq_lock); +raw_spin_unlock_irq (&guc->irq_lock); }static inline void intel_guc_disable_msg (struct intel_guc *guc,u32 mask) { -spin_lock_irq (&guc->irq_lock); +raw_spin_lock_irq (&guc->irq_lock); guc->msg_enabled_mask &= ~mask; -spin_unlock_irq (&guc->irq_lock); +raw_spin_unlock_irq (&guc->irq_lock); } int intel_guc_reset_engine(struct intel_guc *guc,
drivers/gpu/drm/i915/intel_hotplug.c +18 -18
@@ -231,7 +231,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) wakeref =intel_runtime_pm_get (dev_priv); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);for_each_hpd_pin (pin) {struct drm_connector *connector;struct drm_connector_list_iter conn_iter;
@@ -260,7 +260,7 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) }if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) dev_priv->display.hpd_irq_setup (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);intel_runtime_pm_put (dev_priv, wakeref); }
@@ -303,12 +303,12 @@ static void i915_digport_work_func(struct work_struct *work)struct intel_encoder *encoder;u32 old_bits =0 ; -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); long_port_mask = dev_priv->hotplug.long_port_mask; dev_priv->hotplug.long_port_mask =0 ; short_port_mask = dev_priv->hotplug.short_port_mask; dev_priv->hotplug.short_port_mask =0 ; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_digital_port *dig_port;
@@ -335,9 +335,9 @@ static void i915_digport_work_func(struct work_struct *work) }if (old_bits) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); dev_priv->hotplug.event_bits |= old_bits; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);schedule_work (&dev_priv->hotplug.hotplug_work); } }
@@ -360,7 +360,7 @@ static void i915_hotplug_work_func(struct work_struct *work)mutex_lock (&dev->mode_config.mutex);DRM_DEBUG_KMS ("running encoder hotplug functions\n" ); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); hpd_event_bits = dev_priv->hotplug.event_bits; dev_priv->hotplug.event_bits =0 ;
@@ -368,7 +368,7 @@ static void i915_hotplug_work_func(struct work_struct *work)/* Enable polling for connectors which had HPD IRQ storms */ intel_hpd_irq_storm_switch_to_polling (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);drm_connector_list_iter_begin (dev, &conn_iter);drm_for_each_connector_iter (connector, &conn_iter) {
@@ -421,7 +421,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,if (!pin_mask)return ; -spin_lock (&dev_priv->irq_lock); +raw_spin_lock (&dev_priv->irq_lock);/* * Determine whether ->hpd_pulse() exists for each pin, and
@@ -504,7 +504,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,*/ if (storm_detected && dev_priv->display_irqs_enabled) dev_priv->display.hpd_irq_setup (dev_priv); -spin_unlock (&dev_priv->irq_lock); +raw_spin_unlock (&dev_priv->irq_lock);/* * Our hotplug handler can grab modeset locks (by calling down into the
@@ -549,10 +549,10 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)* just to make the assert_spin_locked checks happy. */ if (dev_priv->display_irqs_enabled && dev_priv->display.hpd_irq_setup) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);if (dev_priv->display_irqs_enabled) dev_priv->display.hpd_irq_setup (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); } }
@@ -644,13 +644,13 @@ void intel_hpd_init_work(struct drm_i915_private *dev_priv)void intel_hpd_cancel_work (struct drm_i915_private *dev_priv) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); dev_priv->hotplug.long_port_mask =0 ; dev_priv->hotplug.short_port_mask =0 ; dev_priv->hotplug.event_bits =0 ; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);cancel_work_sync (&dev_priv->hotplug.dig_port_work);cancel_work_sync (&dev_priv->hotplug.hotplug_work);
@@ -665,12 +665,12 @@ bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin)if (pin ==HPD_NONE )return false; -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);if (dev_priv->hotplug.stats[pin].state ==HPD_ENABLED ) { dev_priv->hotplug.stats[pin].state =HPD_DISABLED ; ret = true; } -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);return ret; }
@@ -680,7 +680,7 @@ void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin)if (pin ==HPD_NONE )return ; -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock); dev_priv->hotplug.stats[pin].state =HPD_ENABLED ; -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); }
drivers/gpu/drm/i915/intel_runtime_pm.c +4 -4
@@ -1324,9 +1324,9 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)vlv_init_display_clock_gating (dev_priv); -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);valleyview_enable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);/* * During driver initialization/resume we can avoid restoring the
@@ -1350,9 +1350,9 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)static void vlv_display_power_well_deinit (struct drm_i915_private *dev_priv) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);valleyview_disable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock);/* make sure we're done processing display irqs */ synchronize_irq (dev_priv->drm.irq);
drivers/gpu/drm/i915/intel_tv.c +4 -4
@@ -1574,11 +1574,11 @@ intel_tv_detect_type(struct intel_tv *intel_tv,/* Disable TV interrupts around load detect or we'll recurse */ if (connector->polled &DRM_CONNECTOR_POLL_HPD ) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);i915_disable_pipestat (dev_priv,0 ,PIPE_HOTPLUG_INTERRUPT_STATUS |PIPE_HOTPLUG_TV_INTERRUPT_STATUS ); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); } save_tv_dac = tv_dac =I915_READ (TV_DAC );
@@ -1646,11 +1646,11 @@ intel_tv_detect_type(struct intel_tv *intel_tv,/* Restore interrupt config */ if (connector->polled &DRM_CONNECTOR_POLL_HPD ) { -spin_lock_irq (&dev_priv->irq_lock); +raw_spin_lock_irq (&dev_priv->irq_lock);i915_enable_pipestat (dev_priv,0 ,PIPE_HOTPLUG_INTERRUPT_STATUS |PIPE_HOTPLUG_TV_INTERRUPT_STATUS ); -spin_unlock_irq (&dev_priv->irq_lock); +raw_spin_unlock_irq (&dev_priv->irq_lock); }return type;
Signature · 1 line
2.21.0
Re: [PREEMPT_RT PATCH 2/3] i915: convert all irq_locks spinlocks to raw spinlocks
Quoted 6 lines · Clark Williams
From: Clark Williams <[email protected]>
The following structures contain a member named '
irq_lock'. These three locks are of typespinlock_tand are used in multiple contexts including atomic:
Quoted 6 lines
struct
drm_i915_private
structintel_breadcrumbs
strictintel_gucConvert them all to be
raw_spinlock_tso that lockdep and the lock debugging code will be happy.
What is your motivation to make the lock raw?
I did the following:
void intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) {
- local_irq_disable();
- intel_engine_breadcrumbs_irq(engine);
- local_irq_enable();
+ if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) {
+ intel_engine_breadcrumbs_irq(engine);
+ } else {
+ local_irq_disable();
+ intel_engine_breadcrumbs_irq(engine);
+ local_irq_enable();+ }
}
and lockdep was quiet (+ ignoring/patching the lockdep-irq-off-asserts). The local_irq_disable() is here (my interpretation of the situation) because that function is called from process context while the remaining callers invoke intel_engine_breadcrumbs_irq() from the interrupt handler and it acquires irq_lock via a plain spin_lock(). That local_irq_disable() would be required if everyone did a _irqsave().
I tried to check how much worse the latency gets here but I didn't see anything in a brief test. What I saw however is that switching to fullscreen while playing a video gives me ~0.5 to ~2ms latency. This is has nothing to do with this change, I have to dig deeper… It might be one of the preempt_disable() section I just noticed.
I would prefer to keep the lock non-raw unless there is actual need for it.
Sebastian
Re: [PREEMPT_RT PATCH 2/3] i915: convert all irq_locks spinlocks to raw spinlocks
Quoted 6 lines · To Clark Williams
anything in a brief test. What I saw however is that switching to fullscreen while playing a video gives me ~0.5 to ~2ms latency. This is has nothing to do with this change, I have to dig deeper… It might be one of the
preempt_disable()section I just noticed.
I would prefer to keep the lock non-raw unless there is actual need for it.
That latency spike is caused by the iommu, qi_submit_sync() to be exact. Without the iomm I don't see much difference between the two patches…
Sebastian
Sean V Kelley
Tested-byRe: [PREEMPT_RT PATCH 2/3] i915: convert all irq_locks spinlocks to raw spinlocks
In reply to Sebastian Andrzej SiewiorQuoted 35 lines · Sebastian Andrzej Siewior
Quoted 6 lines · Clark Williams
From: Clark Williams <[email protected]>
The following structures contain a member named '
irq_lock'. These three locks are of typespinlock_tand are used in multiple contexts including atomic:Quoted 6 lines
struct
drm_i915_private
structintel_breadcrumbs
strictintel_gucConvert them all to be
raw_spinlock_tso that lockdep and the lock debugging code will be happy.What is your motivation to make the lock raw?
I did the following:void
intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine){(quoted diff) +7
-3- local_irq_disable(); - intel_engine_breadcrumbs_irq(engine); - local_irq_enable(); + if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) { + intel_engine_breadcrumbs_irq(engine); + } else { + local_irq_disable(); + intel_engine_breadcrumbs_irq(engine); + local_irq_enable(); + }}
Quoted 6 lines
and lockdep was quiet (+ ignoring/patching the lockdep-irq-off-asserts). The
local_irq_disable()is here (my interpretation of the situation) because that function is called from process context while the remaining callers invokeintel_engine_breadcrumbs_irq()from the interrupt handler and it acquiresirq_lockvia a plainspin_lock(). Thatlocal_irq_disable()would be required if everyone did a_irqsave().
I’ve tested this also on the v5.2.14-rt7 and can confirm that it avoids the need for making the locks raw.
Thanks,
Sean
Quoted 10 lines
I tried to check how much worse the latency gets here but I didn't see anything in a brief test. What I saw however is that switching to fullscreen while playing a video gives me ~0.5 to ~2ms latency. This is has nothing to do with this change, I have to dig deeper… It might be one of the
preempt_disable()section I just noticed.
I would prefer to keep the lock non-raw unless there is actual need for it.Sebastian
Re: [PREEMPT_RT PATCH 2/3] i915: convert all irq_locks spinlocks to raw spinlocks
Quoted 3 lines · Sean V Kelley
I’ve tested this also on the v5.2.14-rt7 and can confirm that it avoids the need for making the locks raw.
Tested-by Sean V Kelley <[email protected]>
Good. I went for an alternative approach in v5.2.17-rt9. Now I believe that the three here are obsolete. If not, please give a sign.
Quoted 3 lines
Thanks,
Sean
Sebastian
A message that is not in the archive (sent off-list or not yet received): CAPAFJkofsYgSOxzM4JDkOV3Ra0C-AEpU2eZJjR9F9e_qv-6=rg@mail.gmail.com
Re: [PREEMPT_RT PATCH 2/3] i915: convert all irq_locks spinlocks to raw spinlocks
Quoted 14 lines · Clark Williams
I'm running v5.2.17-rt9 now and have not seen any i915 related splats. I think we're good to drop my patches
On Fri, Sep 27, 2019 at 7:29 AM Sebastian Andrzej Siewior <[email protected]> wrote:
Quoted 3 lines · Sean V Kelley
I’ve tested this also on the v5.2.14-rt7 and can confirm that it avoids the need for making the locks raw.
Tested-by Sean V Kelley <[email protected]>Good. I went for an alternative approach in v5.2.17-rt9. Now I believe that the three here are obsolete. If not, please give a sign.
Confirmed as well..
Sean
Quoted 6 lines
Quoted 4 lines
Thanks,
Sean
Sebastian
PATCH 3/3 i915: convert uncore lock to raw spinlock
In reply to Clark WilliamsFrom: Clark Williams <[email protected]>
The structure intel_uncore contains a spinlock member named 'lock' which is used in multiple contexts. Convert it to a raw spinlock so that lockdep and the lock debugging code will be happy.
--- drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 12 +++--- drivers/gpu/drm/i915/i915_pmu.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 16 ++++---- drivers/gpu/drm/i915/intel_engine_cs.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 8 ++-- drivers/gpu/drm/i915/intel_sprite.c | 32 +++++++-------- drivers/gpu/drm/i915/intel_uncore.c | 52 ++++++++++++------------ drivers/gpu/drm/i915/intel_uncore.h | 2 +- drivers/gpu/drm/i915/intel_workarounds.c | 4 +- 10 files changed, 69 insertions(+), 69 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -726,11 +726,11 @@ void i915_gem_flush_ggtt_writes(struct drm_i915_private *dev_priv)i915_gem_chipset_flush (dev_priv); with_intel_runtime_pm(dev_priv, wakeref) { -spin_lock_irq (&dev_priv->uncore.lock); +raw_spin_lock_irq (&dev_priv->uncore.lock);POSTING_READ_FW (RING_HEAD (RENDER_RING_BASE )); -spin_unlock_irq (&dev_priv->uncore.lock); +raw_spin_unlock_irq (&dev_priv->uncore.lock); } }
drivers/gpu/drm/i915/i915_irq.c +6 -6
@@ -914,7 +914,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe) high_frame =PIPEFRAME (pipe); low_frame =PIPEFRAMEPIXEL (pipe); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);/* * High & low register fields aren't synchronized, so make sure
@@ -927,7 +927,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe) high2 =I915_READ_FW (high_frame) &PIPE_FRAME_HIGH_MASK ; }while (high1 != high2); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); high1 >>=PIPE_FRAME_HIGH_SHIFT ; pixel = low &PIPE_PIXEL_MASK ;
@@ -1097,7 +1097,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,* register reads, potentially with preemption disabled, so the * following code must not block on uncore.lock. */ -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ preempt_disable_rt ();
@@ -1154,7 +1154,7 @@ static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ preempt_enable_rt (); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags);/* * While in vblank, position will be negative
@@ -1184,9 +1184,9 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)unsigned long irqflags;int position; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); position =__intel_get_crtc_scanline (crtc); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags);return position; }
drivers/gpu/drm/i915/i915_pmu.c +2 -2
@@ -172,7 +172,7 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)if (!wakeref)return ; -spin_lock_irqsave (&dev_priv->uncore.lock, flags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, flags);for_each_engine (engine, dev_priv, id) {struct intel_engine_pmu *pmu = &engine->pmu;bool busy;
@@ -202,7 +202,7 @@ engines_sample(struct drm_i915_private *dev_priv, unsigned int period_ns)if (busy)add_sample (&pmu->sample[I915_SAMPLE_BUSY ], period_ns); } -spin_unlock_irqrestore (&dev_priv->uncore.lock, flags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, flags);intel_runtime_pm_put (dev_priv, wakeref); }
drivers/gpu/drm/i915/intel_display.c +8 -8
@@ -3420,7 +3420,7 @@ static void i9xx_update_plane(struct intel_plane *plane,else dspaddr_offset = linear_offset; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (DSPSTRIDE (i9xx_plane), plane_state->color_plane[0 ].stride);
@@ -3462,7 +3462,7 @@ static void i9xx_update_plane(struct intel_plane *plane,intel_plane_ggtt_offset (plane_state) + dspaddr_offset); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void i9xx_disable_plane(struct intel_plane *plane,
@@ -3485,7 +3485,7 @@ static void i9xx_disable_plane(struct intel_plane *plane,*/ dspcntr =i9xx_plane_ctl_crtc (crtc_state); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (DSPCNTR (i9xx_plane), dspcntr);if (INTEL_GEN (dev_priv) >=4 )
@@ -3493,7 +3493,7 @@ static void i9xx_disable_plane(struct intel_plane *plane,else I915_WRITE_FW (DSPADDR (i9xx_plane),0 ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static bool i9xx_plane_get_hw_state(struct intel_plane *plane,
@@ -10282,7 +10282,7 @@ static void i845_update_cursor(struct intel_plane *plane, pos =intel_cursor_position (plane_state); } -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);/* On these chipsets we can only modify the base/size/stride * whilst the cursor is disabled.
@@ -10303,7 +10303,7 @@ static void i845_update_cursor(struct intel_plane *plane,I915_WRITE_FW (CURPOS (PIPE_A ), pos); } -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void i845_disable_cursor(struct intel_plane *plane,
@@ -10507,7 +10507,7 @@ static void i9xx_update_cursor(struct intel_plane *plane, pos =intel_cursor_position (plane_state); } -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);/* * On some platforms writing CURCNTR first will also
@@ -10549,7 +10549,7 @@ static void i9xx_update_cursor(struct intel_plane *plane,I915_WRITE_FW (CURBASE (pipe), base); } -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void i9xx_disable_cursor(struct intel_plane *plane,
drivers/gpu/drm/i915/intel_engine_cs.c +2 -2
@@ -932,7 +932,7 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SELECTOR , FW_REG_READ | FW_REG_WRITE); -spin_lock_irq (&uncore->lock); +raw_spin_lock_irq (&uncore->lock);intel_uncore_forcewake_get__locked (uncore, fw_domains); mcr =intel_uncore_read_fw (uncore,GEN8_MCR_SELECTOR );
@@ -952,7 +952,7 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_write_fw (uncore,GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (uncore, fw_domains); -spin_unlock_irq (&uncore->lock); +raw_spin_unlock_irq (&uncore->lock);return ret; }
drivers/gpu/drm/i915/intel_pm.c +4 -4
@@ -1971,7 +1971,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,* intel_pipe_update_start() has already disabled interrupts * for us, so a plain spin_lock() is sufficient here. */ -spin_lock (&dev_priv->uncore.lock); +raw_spin_lock (&dev_priv->uncore.lock);switch (crtc->pipe) {u32 dsparb, dsparb2, dsparb3;
@@ -2032,7 +2032,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,POSTING_READ_FW (DSPARB ); -spin_unlock (&dev_priv->uncore.lock); +raw_spin_unlock (&dev_priv->uncore.lock); }#undef VLV_FIFO
@@ -10060,7 +10060,7 @@ u64 intel_rc6_residency_ns(struct drm_i915_private *dev_priv, fw_domains =intel_uncore_forcewake_for_reg (uncore, reg,FW_REG_READ ); -spin_lock_irqsave (&uncore->lock, flags); +raw_spin_lock_irqsave (&uncore->lock, flags);intel_uncore_forcewake_get__locked (uncore, fw_domains);/* On VLV and CHV, residency time is in CZ units rather than 1.28us */
@@ -10103,7 +10103,7 @@ u64 intel_rc6_residency_ns(struct drm_i915_private *dev_priv, dev_priv->gt_pm.rc6.cur_residency[i] = time_hw;intel_uncore_forcewake_put__locked (uncore, fw_domains); -spin_unlock_irqrestore (&uncore->lock, flags); +raw_spin_unlock_irqrestore (&uncore->lock, flags);return mul_u64_u32_div (time_hw, mul, div); }
drivers/gpu/drm/i915/intel_sprite.c +16 -16
@@ -541,7 +541,7 @@ skl_program_plane(struct intel_plane *plane, crtc_y =0 ; } -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride);I915_WRITE_FW (PLANE_POS (pipe, plane_id), (crtc_y <<16 ) | crtc_x);
@@ -601,7 +601,7 @@ skl_program_plane(struct intel_plane *plane,if (!slave && plane_state->scaler_id >=0 )skl_program_scaler (plane, crtc_state, plane_state); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void
@@ -638,7 +638,7 @@ skl_disable_plane(struct intel_plane *plane,enum pipe pipe = plane->pipe;unsigned long irqflags; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);if (icl_is_hdr_plane (dev_priv, plane_id))I915_WRITE_FW (PLANE_CUS_CTL (pipe, plane_id),0 );
@@ -648,7 +648,7 @@ skl_disable_plane(struct intel_plane *plane,I915_WRITE_FW (PLANE_CTL (pipe, plane_id),0 );I915_WRITE_FW (PLANE_SURF (pipe, plane_id),0 ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static bool
@@ -878,7 +878,7 @@ vlv_update_plane(struct intel_plane *plane, linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (SPSTRIDE (pipe, plane_id), plane_state->color_plane[0 ].stride);
@@ -909,7 +909,7 @@ vlv_update_plane(struct intel_plane *plane,vlv_update_clrc (plane_state); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void
@@ -921,12 +921,12 @@ vlv_disable_plane(struct intel_plane *plane,enum plane_id plane_id = plane->id;unsigned long irqflags; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (SPCNTR (pipe, plane_id),0 );I915_WRITE_FW (SPSURF (pipe, plane_id),0 ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static bool
@@ -1059,7 +1059,7 @@ ivb_update_plane(struct intel_plane *plane, linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (SPRSTRIDE (pipe), plane_state->color_plane[0 ].stride);I915_WRITE_FW (SPRPOS (pipe), (crtc_y <<16 ) | crtc_x);
@@ -1091,7 +1091,7 @@ ivb_update_plane(struct intel_plane *plane,I915_WRITE_FW (SPRSURF (pipe),intel_plane_ggtt_offset (plane_state) + sprsurf_offset); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void
@@ -1102,7 +1102,7 @@ ivb_disable_plane(struct intel_plane *plane,enum pipe pipe = plane->pipe;unsigned long irqflags; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (SPRCTL (pipe),0 );/* Disable the scaler */
@@ -1110,7 +1110,7 @@ ivb_disable_plane(struct intel_plane *plane,I915_WRITE_FW (SPRSCALE (pipe),0 );I915_WRITE_FW (SPRSURF (pipe),0 ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static bool
@@ -1250,7 +1250,7 @@ g4x_update_plane(struct intel_plane *plane, linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (DVSSTRIDE (pipe), plane_state->color_plane[0 ].stride);I915_WRITE_FW (DVSPOS (pipe), (crtc_y <<16 ) | crtc_x);
@@ -1275,7 +1275,7 @@ g4x_update_plane(struct intel_plane *plane,I915_WRITE_FW (DVSSURF (pipe),intel_plane_ggtt_offset (plane_state) + dvssurf_offset); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static void
@@ -1286,14 +1286,14 @@ g4x_disable_plane(struct intel_plane *plane,enum pipe pipe = plane->pipe;unsigned long irqflags; -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); +raw_spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);I915_WRITE_FW (DVSCNTR (pipe),0 );/* Disable the scaler */ I915_WRITE_FW (DVSSCALE (pipe),0 );I915_WRITE_FW (DVSSURF (pipe),0 ); -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +raw_spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } static bool
drivers/gpu/drm/i915/intel_uncore.c +26 -26
189 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.h +1 -1
@@ -99,7 +99,7 @@ struct intel_uncore {struct i915_runtime_pm *rpm; -spinlock_t lock;/** lock is also taken in irq contexts. */ +raw_spinlock_t lock;/** lock is also taken in irq contexts. */ unsigned int flags;#define UNCORE_HAS_FORCEWAKE BIT(0)
drivers/gpu/drm/i915/intel_workarounds.c +2 -2
@@ -928,7 +928,7 @@ wa_list_apply(struct intel_uncore *uncore, const struct i915_wa_list *wal) fw =wal_get_fw_for_rmw (uncore, wal); -spin_lock_irqsave (&uncore->lock, flags); +raw_spin_lock_irqsave (&uncore->lock, flags);intel_uncore_forcewake_get__locked (uncore, fw);for (i =0 , wa = wal->list; i < wal->count; i++, wa++) {
@@ -936,7 +936,7 @@ wa_list_apply(struct intel_uncore *uncore, const struct i915_wa_list *wal) }intel_uncore_forcewake_put__locked (uncore, fw); -spin_unlock_irqrestore (&uncore->lock, flags); +raw_spin_unlock_irqrestore (&uncore->lock, flags); }void intel_gt_apply_workarounds (struct drm_i915_private *i915)
Signature · 1 line
2.21.0