From 1f1c5fb6dc4b971db8b5b06209a9c554323465ba Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 13 Apr 2012 11:41:32 -0700 Subject: [PATCH] 3.0-stable patches added patches: drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch --- ...ude-last-2-cachlines-of-ring-on-845g.patch | 31 ++++++++++++++ ...us-if-the-hw_i2c-module-param-is-set.patch | 38 +++++++++++++++++ ...dma-buffer-unmapping-for-pci-drivers.patch | 42 +++++++++++++++++++ queue-3.0/series | 3 ++ 4 files changed, 114 insertions(+) create mode 100644 queue-3.0/drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch create mode 100644 queue-3.0/drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch create mode 100644 queue-3.0/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch create mode 100644 queue-3.0/series diff --git a/queue-3.0/drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch b/queue-3.0/drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch new file mode 100644 index 00000000000..2ddb989ede3 --- /dev/null +++ b/queue-3.0/drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch @@ -0,0 +1,31 @@ +From 27c1cbd06a7620b354cbb363834f3bb8df4f410d Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Mon, 9 Apr 2012 13:59:46 +0100 +Subject: drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g + +From: Chris Wilson + +commit 27c1cbd06a7620b354cbb363834f3bb8df4f410d upstream. + +The 845g shares the errata with i830 whereby executing a command +within 2 cachelines of the end of the ringbuffer may cause a GPU hang. + +Signed-off-by: Chris Wilson +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/intel_ringbuffer.c ++++ b/drivers/gpu/drm/i915/intel_ringbuffer.c +@@ -863,7 +863,7 @@ int intel_init_ring_buffer(struct drm_de + * of the buffer. + */ + ring->effective_size = ring->size; +- if (IS_I830(ring->dev)) ++ if (IS_I830(ring->dev) || IS_845G(ring->dev)) + ring->effective_size -= 128; + + return 0; diff --git a/queue-3.0/drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch b/queue-3.0/drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch new file mode 100644 index 00000000000..cbb08f08611 --- /dev/null +++ b/queue-3.0/drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch @@ -0,0 +1,38 @@ +From 46783150a6552f9513f08e62cfcc07125d6e502b Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 10 Apr 2012 12:14:27 -0400 +Subject: drm/radeon: only add the mm i2c bus if the hw_i2c module param is set + +From: Alex Deucher + +commit 46783150a6552f9513f08e62cfcc07125d6e502b upstream. + +It seems it can corrupt the monitor EDID in certain cases on certain +boards when running sensors detect. It's rarely used anyway outside +of AIW boards. + +http://lists.lm-sensors.org/pipermail/lm-sensors/2012-April/035847.html +http://lists.freedesktop.org/archives/xorg/2011-January/052239.html + +Signed-off-by: Alex Deucher +Acked-by: Jean Delvare +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_i2c.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/gpu/drm/radeon/radeon_i2c.c ++++ b/drivers/gpu/drm/radeon/radeon_i2c.c +@@ -898,6 +898,10 @@ struct radeon_i2c_chan *radeon_i2c_creat + struct radeon_i2c_chan *i2c; + int ret; + ++ /* don't add the mm_i2c bus unless hw_i2c is enabled */ ++ if (rec->mm_i2c && (radeon_hw_i2c == 0)) ++ return NULL; ++ + i2c = kzalloc(sizeof(struct radeon_i2c_chan), GFP_KERNEL); + if (i2c == NULL) + return NULL; diff --git a/queue-3.0/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch b/queue-3.0/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch new file mode 100644 index 00000000000..520850c7ab8 --- /dev/null +++ b/queue-3.0/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch @@ -0,0 +1,42 @@ +From 673f7786e205c87b5d978c62827b9a66d097bebb Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Mon, 26 Mar 2012 10:48:20 -0500 +Subject: rtlwifi: Add missing DMA buffer unmapping for PCI drivers + +From: Larry Finger + +commit 673f7786e205c87b5d978c62827b9a66d097bebb upstream. + +In https://bugzilla.kernel.org/show_bug.cgi?id=42976, a system with driver +rtl8192se used as an AP suffers from "Out of SW-IOMMU space" errors. These +are caused by the DMA buffers used for beacons never being unmapped. + +This bug was also reported at +https://bugs.launchpad.net/ubuntu/+source/linux/+bug/961618 + +Reported-and-Tested-by: Da Xue +Signed-off-by: Larry Finger +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rtlwifi/pci.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/rtlwifi/pci.c ++++ b/drivers/net/wireless/rtlwifi/pci.c +@@ -954,8 +954,13 @@ static void _rtl_pci_prepare_bcn_tasklet + memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc)); + ring = &rtlpci->tx_ring[BEACON_QUEUE]; + pskb = __skb_dequeue(&ring->queue); +- if (pskb) ++ if (pskb) { ++ struct rtl_tx_desc *entry = &ring->desc[ring->idx]; ++ pci_unmap_single(rtlpci->pdev, rtlpriv->cfg->ops->get_desc( ++ (u8 *) entry, true, HW_DESC_TXBUFF_ADDR), ++ pskb->len, PCI_DMA_TODEVICE); + kfree_skb(pskb); ++ } + + /*NB: the beacon data buffer must be 32-bit aligned. */ + pskb = ieee80211_beacon_get(hw, mac->vif); diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..2e785bc0ef7 --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1,3 @@ +drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch +drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch +rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch -- 2.47.3