diff options
Diffstat (limited to 'debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch')
| -rw-r--r-- | debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch b/debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch index 73cbfb256..932bc67d5 100644 --- a/debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch +++ b/debian/patches-rt/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch @@ -1,7 +1,7 @@ Subject: drm,i915: Use local_lock/unlock_irq() in intel_pipe_update_start/end() From: Mike Galbraith <umgwanakikbuti@gmail.com> Date: Sat, 27 Feb 2016 09:01:42 +0100 -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz [ 8.014039] BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:918 @@ -57,11 +57,11 @@ Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: linux-rt-users <linux-rt-users@vger.kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- - drivers/gpu/drm/i915/intel_sprite.c | 13 ++++++++----- + drivers/gpu/drm/i915/display/intel_sprite.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---- a/drivers/gpu/drm/i915/intel_sprite.c -+++ b/drivers/gpu/drm/i915/intel_sprite.c +--- a/drivers/gpu/drm/i915/display/intel_sprite.c ++++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -38,6 +38,7 @@ #include <drm/drm_plane_helper.h> #include <drm/drm_rect.h> @@ -69,8 +69,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +#include <linux/locallock.h> #include "i915_drv.h" - #include "intel_atomic_plane.h" -@@ -79,6 +80,8 @@ int intel_usecs_to_scanlines(const struc + #include "i915_trace.h" +@@ -80,6 +81,8 @@ int intel_usecs_to_scanlines(const struc #define VBLANK_EVASION_TIME_US 100 #endif @@ -79,7 +79,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /** * intel_pipe_update_start() - start update of a set of display registers * @new_crtc_state: the new crtc state -@@ -128,7 +131,7 @@ void intel_pipe_update_start(const struc +@@ -129,7 +132,7 @@ void intel_pipe_update_start(const struc DRM_ERROR("PSR idle timed out 0x%x, atomic update may fail\n", psr_status); @@ -88,7 +88,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> crtc->debug.min_vbl = min; crtc->debug.max_vbl = max; -@@ -152,11 +155,11 @@ void intel_pipe_update_start(const struc +@@ -153,11 +156,11 @@ void intel_pipe_update_start(const struc break; } @@ -102,7 +102,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } finish_wait(wq, &wait); -@@ -189,7 +192,7 @@ void intel_pipe_update_start(const struc +@@ -190,7 +193,7 @@ void intel_pipe_update_start(const struc return; irq_disable: @@ -111,7 +111,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } /** -@@ -225,7 +228,7 @@ void intel_pipe_update_end(struct intel_ +@@ -226,7 +229,7 @@ void intel_pipe_update_end(struct intel_ new_crtc_state->base.event = NULL; } |