diff options
| -rw-r--r-- | drm-i915-hush-check-crtc-state.patch | 17 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 22 insertions, 0 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch new file mode 100644 index 000000000..f50352be6 --- /dev/null +++ b/drm-i915-hush-check-crtc-state.patch @@ -0,0 +1,17 @@ +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. + +diff -up linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c.jx linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c +--- linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c.jx 2013-11-03 18:41:51.000000000 -0500 ++++ linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c 2013-11-13 10:12:05.781301624 -0500 +@@ -8803,7 +8803,7 @@ check_crtc_state(struct drm_device *dev) + + if (active && + !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { +- WARN(1, "pipe state doesn't match!\n"); ++ DRM_DEBUG_KMS("pipe state doesn't match!\n"); + intel_dump_pipe_config(crtc, &pipe_config, + "[hw state]"); + intel_dump_pipe_config(crtc, &crtc->config, diff --git a/kernel.spec b/kernel.spec index 6493b07d8..01947e4f9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -650,6 +650,7 @@ Patch1003: sysrq-secure-boot.patch # nouveau + drm fixes # intel drm is all merged upstream Patch1825: drm-i915-dp-stfu.patch +Patch1826: drm-i915-hush-check-crtc-state.patch # Quiet boot fixes # silence the ACPI blacklist code @@ -1373,6 +1374,7 @@ ApplyPatch sysrq-secure-boot.patch # Intel DRM ApplyPatch drm-i915-dp-stfu.patch +ApplyPatch drm-i915-hush-check-crtc-state.patch # Radeon DRM @@ -2245,6 +2247,9 @@ fi # ||----w | # || || %changelog +* Wed Nov 13 2013 Adam Jackson <ajax@redhat.com> +- Hush i915's check_crtc_state() + * Tue Nov 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git2.1 - Linux v3.12-4849-g10d0c97 |