From ca018e7e1277d602e4303c8f75df1973865f9205 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 30 May 2012 13:46:01 +0000 Subject: [PATCH] [x86] drm/i915:: Disable FBC on SandyBridge (Closes: #675022) svn path=/dists/sid/linux-2.6/; revision=19046 --- debian/changelog | 1 + .../drm-i915-Disable-FBC-on-SandyBridge.patch | 32 +++++++++++++++++++ debian/patches/series/base | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch diff --git a/debian/changelog b/debian/changelog index e7796c8ea..df5869d3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux-2.6 (3.2.18-2) UNRELEASED; urgency=low * net/sched: Add codel and fq_codel from Linux 3.5-rc1 * [x86] udeb: Add hyperv-modules containing Hyper-V paravirtualised drivers * [x86] ata_piix: defer disks to the Hyper-V drivers by default + * [x86] drm/i915:: Disable FBC on SandyBridge (Closes: #675022) -- Ben Hutchings Sun, 27 May 2012 01:12:44 +0100 diff --git a/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch b/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch new file mode 100644 index 000000000..a05704fe8 --- /dev/null +++ b/debian/patches/bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch @@ -0,0 +1,32 @@ +From: Chris Wilson +Date: Tue, 8 Nov 2011 23:17:34 +0000 +Subject: [PATCH] drm/i915:: Disable FBC on SandyBridge + +commit d56d8b28e9247e7e35e02fbb12b12239a2c33ad1 upstream. + +Enabling FBC is causing the BLT ring to run between 10-100x slower than +normal and frequently lockup. The interim solution is disable FBC once +more until we know why. + +Signed-off-by: Chris Wilson +Signed-off-by: Keith Packard +--- + 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 b3b51c4..19f35ec 100644 +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -1872,7 +1872,7 @@ static void intel_update_fbc(struct drm_device *dev) + if (enable_fbc < 0) { + DRM_DEBUG_KMS("fbc set to per-chip default\n"); + enable_fbc = 1; +- if (INTEL_INFO(dev)->gen <= 5) ++ if (INTEL_INFO(dev)->gen <= 6) + enable_fbc = 0; + } + if (!enable_fbc) { +-- +1.7.10 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 478372fb3..520a90397 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -307,3 +307,5 @@ + features/all/codel/0005-net-codel-fix-build-errors.patch + features/all/codel/0006-codel-use-u16-field-instead-of-31bits-for-rec_inv_sq.patch + features/all/codel/0007-fq_codel-should-use-qdisc-backlog-as-threshold.patch + ++ bugfix/all/drm-i915-Disable-FBC-on-SandyBridge.patch