[kernel] r19722 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Sat Jan 12 02:04:00 2013
New Revision: 19722

Log:
[x86] drm/i915: Attempt to fix watermark setup on 85x (v2) (Closes: #661696)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/47

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Jan 12 00:38:40 2013	(r19721)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Jan 12 02:04:00 2013	(r19722)
@@ -76,6 +76,8 @@
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.60
   * [x86] Don't use the EFI reboot method by default (Closes: #626022)
+  * [x86] drm/i915: Attempt to fix watermark setup on 85x (v2)
+    (Closes: #661696)
 
   [ Jonathan Nieder ]
   * megaraid_sas: Backport changes up to Linux 3.0.56 (Closes: #666108)

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch	Sat Jan 12 02:04:00 2013	(r19722)
@@ -0,0 +1,46 @@
+From: Adam Jackson <ajax at redhat.com>
+Date: Fri, 16 Apr 2010 18:20:57 -0400
+Subject: drm/i915: Attempt to fix watermark setup on 85x (v2)
+
+commit 8f4695ed1c9e068772bcce4cd4ff03f88d57a008 upstream.
+
+IS_MOBILE() catches 85x, so we'd always try to use the 9xx FIFO sizing;
+since there's an explicit 85x version, this seems wrong.
+
+v2: Handle 830m correctly too.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+Reviewed-by: Eric Anholt <eric at anholt.net>
+Signed-off-by: Eric Anholt <eric at anholt.net>
+---
+ drivers/gpu/drm/i915/intel_display.c |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index e7356fb..c7502b6 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -4853,17 +4853,18 @@ static void intel_init_display(struct drm_device *dev)
+ 		dev_priv->display.update_wm = g4x_update_wm;
+ 	else if (IS_I965G(dev))
+ 		dev_priv->display.update_wm = i965_update_wm;
+-	else if (IS_I9XX(dev) || IS_MOBILE(dev)) {
++	else if (IS_I9XX(dev)) {
+ 		dev_priv->display.update_wm = i9xx_update_wm;
+ 		dev_priv->display.get_fifo_size = i9xx_get_fifo_size;
++	} else if (IS_I85X(dev)) {
++		dev_priv->display.update_wm = i9xx_update_wm;
++		dev_priv->display.get_fifo_size = i85x_get_fifo_size;
+ 	} else {
+-		if (IS_I85X(dev))
+-			dev_priv->display.get_fifo_size = i85x_get_fifo_size;
+-		else if (IS_845G(dev))
++		dev_priv->display.update_wm = i830_update_wm;
++		if (IS_845G(dev))
+ 			dev_priv->display.get_fifo_size = i845_get_fifo_size;
+ 		else
+ 			dev_priv->display.get_fifo_size = i830_get_fifo_size;
+-		dev_priv->display.update_wm = i830_update_wm;
+ 	}
+ }
+ 

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Sat Jan 12 00:38:40 2013	(r19721)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Sat Jan 12 02:04:00 2013	(r19722)
@@ -170,3 +170,4 @@
 + bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
 + debian/random-Avoid-ABI-change-in-irq_desc.patch
 + debian/epoll-Avoid-ABI-change-in-file.patch
++ bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch