diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-05 14:00:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-09-05 14:00:57 -0400 |
| commit | dc7f0ccd3c00c2c269c49d43532d512be1836116 (patch) | |
| tree | ecf99dc32a16e83238e09d3b33a3c85b73b15775 | |
| parent | ef2851c6259c327ec44e5d313e22478a1e669fb7 (diff) | |
| download | 4.8-rt-patches-dc7f0ccd3c00c2c269c49d43532d512be1836116.tar.gz | |
i915: refresh NONRT conversion
| -rw-r--r-- | patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch index 8582799ec45877..ecde9c12de3057 100644 --- a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch +++ b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch @@ -1,6 +1,7 @@ +From 98f47c67800f10e6c2e341d54c9312fd7aed5141 Mon Sep 17 00:00:00 2001 From: Clark Williams <williams@redhat.com> Date: Tue, 26 May 2015 10:43:43 -0500 -Subject: i915: bogus warning from i915 when running on PREEMPT_RT +Subject: [PATCH] i915: bogus warning from i915 when running on PREEMPT_RT The i915 driver has a 'WARN_ON(!in_interrupt())' in the display handler, which whines constanly on the RT kernel (since the interrupt @@ -12,18 +13,20 @@ Change the WARN_ON to WARN_ON_NORT Tested-by: Joakim Hernberg <jhernberg@alchemy.lu> Signed-off-by: Clark Williams <williams@redhat.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - drivers/gpu/drm/i915/intel_display.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c +index c457eed76f1f..1ddb025a0c84 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -11496,7 +11496,7 @@ void intel_check_page_flip(struct drm_de +@@ -11546,7 +11546,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe) struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - struct intel_unpin_work *work; + struct intel_flip_work *work; - WARN_ON(!in_interrupt()); + WARN_ON_NONRT(!in_interrupt()); if (crtc == NULL) return; +-- +2.5.0 + |