summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-09-16 19:29:54 +0000
committerJeremy Cline <jcline@redhat.com>2019-09-16 20:30:31 +0000
commita08a03541f85cdb3ed4e04cf2f202d48280435e1 (patch)
tree41da4227eda57e83260f90a77ae4ce28d51181f5
parent124297ef77670fd8d3ae8bc7052e63be4f9ea497 (diff)
downloadkernel-a08a03541f85cdb3ed4e04cf2f202d48280435e1.tar.gz
kernel-a08a03541f85cdb3ed4e04cf2f202d48280435e1.tar.xz
kernel-a08a03541f85cdb3ed4e04cf2f202d48280435e1.zip
Drop drm-i915-hush-check-crtc-state.patch
This patch from 2013 stops the i915 driver from spitting out WARNs in some cases, but nearly the same thing can be achieved with the ``verbose_state_checks=false`` module option added in 2014. With the module setting the issue results in a log message at error level rather than the debug level set by this patch. However, it's not known if this is still a common issue. It seems worth the cost of (maybe) a few more bug reports about new error-level logs to drop the patch. To start with, we're going to leave ``verbose_state_checks=true`` (the default), but if we run into a lot of WARNs we will turn it off.
-rw-r--r--drm-i915-hush-check-crtc-state.patch32
-rw-r--r--kernel.spec2
2 files changed, 0 insertions, 34 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
deleted file mode 100644
index 6e2481838..000000000
--- a/drm-i915-hush-check-crtc-state.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8f8f3ee1e3ae35df618761475293dc5d8285b6e0 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10 Jul 2017 08:11:48 -0700
-Subject: [PATCH] drm/i915: hush check crtc state
-
-This is _by far_ the most common backtrace for i915 on retrace.fp.o, and
-it's mostly useless noise. There's not enough context when it's generated
-to know if something actually went wrong. Downgrade the message to
-KMS debugging so we can still get it if we want it.
-
-Bugzilla: 1027037 1028785
-Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/035948.html
----
- drivers/gpu/drm/i915/display/intel_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
-index 8592a7d422de..e915cf6b0ba6 100644
---- a/drivers/gpu/drm/i915/display/intel_display.c
-+++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -12982,7 +12982,7 @@ verify_crtc_state(struct drm_crtc *crtc,
-
- sw_config = to_intel_crtc_state(new_crtc_state);
- if (!intel_pipe_config_compare(sw_config, pipe_config, false)) {
-- I915_STATE_WARN(1, "pipe state doesn't match!\n");
-+ DRM_DEBUG_KMS(1, "pipe state doesn't match!\n");
- intel_dump_pipe_config(pipe_config, NULL, "[hw state]");
- intel_dump_pipe_config(sw_config, NULL, "[sw state]");
- }
---
-2.21.0
-
diff --git a/kernel.spec b/kernel.spec
index 578af9658..75547d7b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -508,8 +508,6 @@ Patch209: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch
Patch210: disable-i8042-check-on-apple-mac.patch
-Patch211: drm-i915-hush-check-crtc-state.patch
-
Patch212: efi-secureboot.patch
# 300 - ARM patches