refresh drm/i915 patch and get rid of troublesome brackets in name

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 18 insertions, 15 deletions

diff --git a/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch b/patches/drm-i915-Use-local_lock-unlock_irq-in-intel_pipe_upd.patch
index 38a0ece74ccb29..b9fddd45bd7b70 100644
--- a/patches/drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch
+++ b/patches/drm-i915-Use-local_lock-unlock_irq-in-intel_pipe_upd.patch
@@ -1,7 +1,8 @@
-Subject: drm,i915: Use local_lock/unlock_irq() in intel_pipe_update_start/end()
+From 9a38b5ea8ca0ded10d67c47237be1ff57b5615d5 Mon Sep 17 00:00:00 2001
 From: Mike Galbraith <umgwanakikbuti@gmail.com>
 Date: Sat, 27 Feb 2016 09:01:42 +0100
-
+Subject: [PATCH] drm,i915: Use local_lock/unlock_irq() in
+ intel_pipe_update_start/end()
 
 [    8.014039] BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:918
 [    8.014041] in_atomic(): 0, irqs_disabled(): 1, pid: 78, name: kworker/u4:4
@@ -55,10 +56,9 @@ Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
 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 |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
 
+diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
+index f7d431427115..aa5a8900e052 100644
 --- a/drivers/gpu/drm/i915/intel_sprite.c
 +++ b/drivers/gpu/drm/i915/intel_sprite.c
 @@ -35,6 +35,7 @@
@@ -69,17 +69,17 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  #include "intel_drv.h"
  #include "intel_frontbuffer.h"
  #include <drm/i915_drm.h>
-@@ -65,6 +66,8 @@ int intel_usecs_to_scanlines(const struc
- 			    1000 * adjusted_mode->crtc_htotal);
- }
+@@ -67,6 +68,8 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
+ 
+ #define VBLANK_EVASION_TIME_US 100
  
 +static DEFINE_LOCAL_IRQ_LOCK(pipe_update_lock);
 +
  /**
   * intel_pipe_update_start() - start update of a set of display registers
   * @crtc: the crtc of which the registers are going to be updated
-@@ -98,7 +101,7 @@ void intel_pipe_update_start(struct inte
- 	min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100);
+@@ -98,7 +101,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
+ 						      VBLANK_EVASION_TIME_US);
  	max = vblank_start - 1;
  
 -	local_irq_disable();
@@ -87,7 +87,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  
  	if (min <= 0 || max <= 0)
  		return;
-@@ -128,11 +131,11 @@ void intel_pipe_update_start(struct inte
+@@ -128,11 +131,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
  			break;
  		}
  
@@ -101,12 +101,15 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	}
  
  	finish_wait(wq, &wait);
-@@ -202,7 +205,7 @@ void intel_pipe_update_end(struct intel_
+@@ -185,7 +188,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
  		crtc->base.state->event = NULL;
  	}
  
 -	local_irq_enable();
 +	local_unlock_irq(pipe_update_lock);
  
- 	if (crtc->debug.start_vbl_count &&
- 	    crtc->debug.start_vbl_count != end_vbl_count) {
+ 	if (intel_vgpu_active(dev_priv))
+ 		return;
+-- 
+2.1.4
+
diff --git a/patches/series b/patches/series
index 1d97e602c33bc6..522d48d15cdb91 100644
--- a/patches/series
+++ b/patches/series
@@ -687,7 +687,7 @@ drivers-zram-fix-zcomp_stream_get-smp_processor_id-u.patch
 drm-i915-drop-trace_i915_gem_ring_dispatch-onrt.patch
 i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch
 drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch
-drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch
+drm-i915-Use-local_lock-unlock_irq-in-intel_pipe_upd.patch
 drm-i915-init-spinlock-properly-on-RT.patch
 
 # CGROUPS