From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 May 2012 00:29:15 +0000 (-0700)
Subject: 3.3-stable patches
X-Git-Tag: v3.3.6~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c7e850b95a8c371a8a483a826d7648cbda618b3;p=thirdparty%2Fkernel%2Fstable-queue.git

3.3-stable patches

added patches:
	drm-i915-enable-dip-before-writing-data-on-gen4.patch
	smsc95xx-mark-link-down-on-startup-and-let-phy-interrupt.patch
---

diff --git a/queue-3.3/drm-i915-enable-dip-before-writing-data-on-gen4.patch b/queue-3.3/drm-i915-enable-dip-before-writing-data-on-gen4.patch
new file mode 100644
index 00000000000..1700cf2ceb3
--- /dev/null
+++ b/queue-3.3/drm-i915-enable-dip-before-writing-data-on-gen4.patch
@@ -0,0 +1,48 @@
+From c1230df7e19e0f27655c0eb9d966c7e03be7cc50 Mon Sep 17 00:00:00 2001
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Date: Wed, 2 May 2012 22:55:43 -0300
+Subject: drm/i915: enable dip before writing data on gen4
+
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+
+commit c1230df7e19e0f27655c0eb9d966c7e03be7cc50 upstream.
+
+While testing with the intel_infoframes tool on gen4, I see that when
+video DIP is disabled, what we write to the DATA memory is not exactly
+what we read back later.
+
+This regression has been introduce in
+
+commit 64a8fc0145a1d0fdc25fc9367c2e6c621955fb3b
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date:   Thu Sep 22 11:16:00 2011 +0530
+
+    drm/i915: fix ILK+ infoframe support
+
+That commit was setting VIDEO_DIP_CTL to 0 when initializing, which
+caused the problem.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43947
+Tested-by: Yang Guang <guang.a.yang@intel.com>
+Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
+[danvet: Pimped commit message by using the usual commit citation
+layout.]
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_hdmi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/intel_hdmi.c
++++ b/drivers/gpu/drm/i915/intel_hdmi.c
+@@ -136,7 +136,7 @@ static void i9xx_write_infoframe(struct
+ 
+ 	val &= ~VIDEO_DIP_SELECT_MASK;
+ 
+-	I915_WRITE(VIDEO_DIP_CTL, val | port | flags);
++	I915_WRITE(VIDEO_DIP_CTL, VIDEO_DIP_ENABLE | val | port | flags);
+ 
+ 	for (i = 0; i < len; i += 4) {
+ 		I915_WRITE(VIDEO_DIP_DATA, *data);
diff --git a/queue-3.3/series b/queue-3.3/series
new file mode 100644
index 00000000000..71cfc427318
--- /dev/null
+++ b/queue-3.3/series
@@ -0,0 +1,2 @@
+drm-i915-enable-dip-before-writing-data-on-gen4.patch
+smsc95xx-mark-link-down-on-startup-and-let-phy-interrupt.patch
diff --git a/queue-3.3/smsc95xx-mark-link-down-on-startup-and-let-phy-interrupt.patch b/queue-3.3/smsc95xx-mark-link-down-on-startup-and-let-phy-interrupt.patch
new file mode 100644
index 00000000000..63ac5daf49f
--- /dev/null
+++ b/queue-3.3/smsc95xx-mark-link-down-on-startup-and-let-phy-interrupt.patch
@@ -0,0 +1,44 @@
+From 07d69d4238418746a7b85c5d05ec17c658a2a390 Mon Sep 17 00:00:00 2001
+From: Paolo Pisati <paolo.pisati@canonical.com>
+Date: Mon, 23 Apr 2012 04:05:20 +0000
+Subject: smsc95xx: mark link down on startup and let PHY interrupt
+ deal with carrier changes
+
+From: Paolo Pisati <paolo.pisati@canonical.com>
+
+commit 07d69d4238418746a7b85c5d05ec17c658a2a390 upstream.
+
+Without this patch sysfs reports the cable as present
+
+flag@flag-desktop:~$ cat /sys/class/net/eth0/carrier
+1
+
+while it's not:
+
+flag@flag-desktop:~$ sudo mii-tool eth0
+eth0: no link
+
+Tested on my Beagle XM.
+
+v2: added mantainer to the list of recipient
+
+Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
+Acked-by: Steve Glendinning <steve.glendinning@shawell.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/smsc95xx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/usb/smsc95xx.c
++++ b/drivers/net/usb/smsc95xx.c
+@@ -1191,7 +1191,7 @@ static const struct driver_info smsc95xx
+ 	.rx_fixup	= smsc95xx_rx_fixup,
+ 	.tx_fixup	= smsc95xx_tx_fixup,
+ 	.status		= smsc95xx_status,
+-	.flags		= FLAG_ETHER | FLAG_SEND_ZLP,
++	.flags		= FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
+ };
+ 
+ static const struct usb_device_id products[] = {