diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 02:52:46 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 02:52:46 -0500 |
| commit | 95e891e8bea5a5cfac379288c14ff72e881bdbc5 (patch) | |
| tree | 03b5d8430391289d7e3b0f82379a979cf0b5f608 | |
| parent | 9fae54aeaa73fb92f947c167c3b108d3677cab7b (diff) | |
| download | 4.9-rt-patches-95e891e8bea5a5cfac379288c14ff72e881bdbc5.tar.gz | |
i915: import refreshed local_unlock for header ctxt changesrt-v4.8-14088-g6b25e21fa6f2
| -rw-r--r-- | patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch b/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch index 9e89971002b33e..c574a092c809e5 100644 --- a/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch +++ b/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch @@ -61,15 +61,15 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c -@@ -38,6 +38,7 @@ +@@ -35,6 +35,7 @@ + #include <drm/drm_rect.h> + #include <drm/drm_atomic.h> + #include <drm/drm_plane_helper.h> ++#include <linux/locallock.h> #include "intel_drv.h" + #include "intel_frontbuffer.h" #include <drm/i915_drm.h> - #include "i915_drv.h" -+#include <linux/locallock.h> - - static bool - format_is_yuv(uint32_t format) -@@ -64,6 +65,8 @@ int intel_usecs_to_scanlines(const struc +@@ -65,6 +66,8 @@ int intel_usecs_to_scanlines(const struc 1000 * adjusted_mode->crtc_htotal); } @@ -78,7 +78,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> /** * intel_pipe_update_start() - start update of a set of display registers * @crtc: the crtc of which the registers are going to be updated -@@ -94,7 +97,7 @@ void intel_pipe_update_start(struct inte +@@ -95,7 +98,7 @@ void intel_pipe_update_start(struct inte min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100); max = vblank_start - 1; @@ -87,7 +87,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> if (min <= 0 || max <= 0) return; -@@ -124,11 +127,11 @@ void intel_pipe_update_start(struct inte +@@ -125,11 +128,11 @@ void intel_pipe_update_start(struct inte break; } @@ -101,7 +101,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> } finish_wait(wq, &wait); -@@ -180,7 +183,7 @@ void intel_pipe_update_end(struct intel_ +@@ -181,7 +184,7 @@ void intel_pipe_update_end(struct intel_ crtc->base.state->event = NULL; } |