From acf77908ea6bd142dc3e762463be5b8de8853753 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 17 Mar 2015 10:25:37 -0500 Subject: [PATCH] Re-add patch to quiet i915 state machine --- drm-i915-Disable-verbose-state-checks.patch | 31 +++++++++++++++++++++ kernel.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 drm-i915-Disable-verbose-state-checks.patch diff --git a/drm-i915-Disable-verbose-state-checks.patch b/drm-i915-Disable-verbose-state-checks.patch new file mode 100644 index 000000000..08e988871 --- /dev/null +++ b/drm-i915-Disable-verbose-state-checks.patch @@ -0,0 +1,31 @@ +From: Josh Boyer +Date: Thu, 29 Jan 2015 14:03:17 -0500 +Subject: [PATCH] drm/i915: Disable verbose state checks + +For stable releases, we disable the verbose state checks in the i915 driver. +They are mostly for development purposes and they fill the retrace server +to the point of uselessness. We leave these enabled in rawhide kernels, +where they are both more likely to get attention from upstream and more +likely to be fixable. + +Signed-off-by: Josh Boyer +--- + drivers/gpu/drm/i915/i915_params.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c +index db07153b693f..c049fe3fbdff 100644 +--- a/drivers/gpu/drm/i915/i915_params.c ++++ b/drivers/gpu/drm/i915/i915_params.c +@@ -51,7 +51,7 @@ struct i915_params i915 __read_mostly = { + .disable_vtd_wa = 0, + .use_mmio_flip = 0, + .mmio_debug = 0, +- .verbose_state_checks = 1, ++ .verbose_state_checks = 0, + }; + + module_param_named(modeset, i915.modeset, int, 0400); +-- +2.1.0 + diff --git a/kernel.spec b/kernel.spec index df6fe3529..ef4c098e1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 200 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -558,6 +558,7 @@ Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch # intel drm is all merged upstream Patch1825: drm-i915-tame-the-chattermouth-v2.patch Patch1826: drm-i915-hush-check-crtc-state.patch +Patch1827: drm-i915-Disable-verbose-state-checks.patch # Quiet boot fixes @@ -1334,6 +1335,7 @@ ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch # Intel DRM ApplyPatch drm-i915-tame-the-chattermouth-v2.patch ApplyPatch drm-i915-hush-check-crtc-state.patch +ApplyPatch drm-i915-Disable-verbose-state-checks.patch # Radeon DRM @@ -2273,6 +2275,9 @@ fi # ||----w | # || || %changelog +* Tue Mar 17 2015 Justin M. Forbes +- Re-add patch to quiet i915 state machine + * Mon Mar 16 2015 Justin M. Forbes - 3.19.1-200 - Linux v3.19.1