drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates
BugLink: https://bugs.launchpad.net/bugs/2060704
Commit
8d7849db3e ("drm/i915: Make sprite updates atomic")
started disabling interrupts across atomic updates. This breaks on PREEMPT_RT
because within this section the code attempt to acquire spinlock_t locks which
are sleeping locks on PREEMPT_RT.
According to the comment the interrupts are disabled to avoid random delays and
not required for protection or synchronisation.
If this needs to happen with disabled interrupts on PREEMPT_RT, and the
whole section is restricted to register access then all sleeping locks
need to be acquired before interrupts are disabled and some function
maybe moved after enabling interrupts again.
This includes:
- prepare_to_wait() + finish_wait() due its wake queue.
- drm_crtc_vblank_put() -> vblank_disable_fn() drm_device::vbl_lock.
- skl_pfit_enable(), intel_update_plane(), vlv_atomic_update_fifo() and
maybe others due to intel_uncore::lock
- drm_crtc_arm_vblank_event() due to drm_device::event_lock and
drm_device::vblank_time_lock.
Don't disable interrupts on PREEMPT_RT during atomic updates.
[bigeasy: drop local locks, commit message]
Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
This commit is contained in:
committed by
Kevin Becker
parent
8ef07efdde
commit
5a758981bc
@@ -580,7 +580,8 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
|
||||
*/
|
||||
intel_psr_wait_for_idle_locked(new_crtc_state);
|
||||
|
||||
local_irq_disable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_disable();
|
||||
|
||||
crtc->debug.min_vbl = min;
|
||||
crtc->debug.max_vbl = max;
|
||||
@@ -605,11 +606,13 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
|
||||
break;
|
||||
}
|
||||
|
||||
local_irq_enable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_enable();
|
||||
|
||||
timeout = schedule_timeout(timeout);
|
||||
|
||||
local_irq_disable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_disable();
|
||||
}
|
||||
|
||||
finish_wait(wq, &wait);
|
||||
@@ -642,7 +645,8 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
|
||||
return;
|
||||
|
||||
irq_disable:
|
||||
local_irq_disable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_disable();
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_VBLANK_EVADE)
|
||||
@@ -744,7 +748,8 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
|
||||
*/
|
||||
intel_vrr_send_push(new_crtc_state);
|
||||
|
||||
local_irq_enable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_enable();
|
||||
|
||||
if (intel_vgpu_active(dev_priv))
|
||||
goto out;
|
||||
|
||||
Reference in New Issue
Block a user