3.0-stable patches

added patches:
	drm-radeon-fix-lcd-record-parsing.patch

diff --git a/queue-3.0/drm-radeon-fix-lcd-record-parsing.patch b/queue-3.0/drm-radeon-fix-lcd-record-parsing.patch
new file mode 100644 (file)
index 0000000..4bcc46a
--- /dev/null
+++ b/queue-3.0/drm-radeon-fix-lcd-record-parsing.patch
@@ -0,0 +1,34 @@
+From 95663948ba22a4be8b99acd67fbf83e86ddffba4 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 20 Aug 2013 14:59:01 -0400
+Subject: drm/radeon: fix LCD record parsing
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 95663948ba22a4be8b99acd67fbf83e86ddffba4 upstream.
+
+If the LCD table contains an EDID record, properly account
+for the edid size when walking through the records.
+
+This should fix error messages about unknown LCD records.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -1658,7 +1658,9 @@ struct radeon_encoder_atom_dig *radeon_a
+                                                               kfree(edid);
+                                               }
+                                       }
+-                                      record += sizeof(ATOM_FAKE_EDID_PATCH_RECORD);
++                                      record += fake_edid_record->ucFakeEDIDLength ?
++                                              fake_edid_record->ucFakeEDIDLength + 2 :
++                                              sizeof(ATOM_FAKE_EDID_PATCH_RECORD);
+                                       break;
+                               case LCD_PANEL_RESOLUTION_RECORD_TYPE:
+                                       panel_res_record = (ATOM_PANEL_RESOLUTION_PATCH_RECORD *)record;

diff --git a/queue-3.0/series b/queue-3.0/series
index ec141204c54f51ab5a189c25f7c83dcc766c0d43..31a749c367e4eba2225f690ea45cb32d0d3e7d0f 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -3,3 +3,4 @@ net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch
 rt2800-fix-wrong-tx-power-compensation.patch
 hid-provide-a-helper-for-validating-hid-reports.patch
 hid-zeroplus-validate-output-report-details.patch
+drm-radeon-fix-lcd-record-parsing.patch