From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Jan 2014 17:30:50 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.76~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ce46b5eb71793fd9072de3f042f9e69ee2c6bc1;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	drm-edid-add-quirk-for-bpc-in-samsung-np700g7a-s01pl-notebook.patch
---

diff --git a/queue-3.4/drm-edid-add-quirk-for-bpc-in-samsung-np700g7a-s01pl-notebook.patch b/queue-3.4/drm-edid-add-quirk-for-bpc-in-samsung-np700g7a-s01pl-notebook.patch
new file mode 100644
index 00000000000..6ee36880f7f
--- /dev/null
+++ b/queue-3.4/drm-edid-add-quirk-for-bpc-in-samsung-np700g7a-s01pl-notebook.patch
@@ -0,0 +1,59 @@
+From 49d45a31b71d7d9da74485922bdb63faf3dc9684 Mon Sep 17 00:00:00 2001
+From: Rafał Miłecki <zajec5@gmail.com>
+Date: Sat, 7 Dec 2013 13:22:42 +0100
+Subject: drm/edid: add quirk for BPC in Samsung NP700G7A-S01PL notebook
+
+From: Rafał Miłecki <zajec5@gmail.com>
+
+commit 49d45a31b71d7d9da74485922bdb63faf3dc9684 upstream.
+
+This bug in EDID was exposed by:
+
+commit eccea7920cfb009c2fa40e9ecdce8c36f61cab66
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date:   Mon Mar 26 15:12:54 2012 -0400
+
+    drm/radeon/kms: improve bpc handling (v2)
+
+Which resulted in kind of regression in 3.5. This fixes
+https://bugs.freedesktop.org/show_bug.cgi?id=70934
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_edid.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -68,6 +68,8 @@
+ #define EDID_QUIRK_DETAILED_SYNC_PP		(1 << 6)
+ /* Force reduced-blanking timings for detailed modes */
+ #define EDID_QUIRK_FORCE_REDUCED_BLANKING	(1 << 7)
++/* Force 8bpc */
++#define EDID_QUIRK_FORCE_8BPC			(1 << 8)
+ 
+ struct detailed_mode_closure {
+ 	struct drm_connector *connector;
+@@ -128,6 +130,9 @@ static struct edid_quirk {
+ 
+ 	/* Medion MD 30217 PG */
+ 	{ "MED", 0x7b8, EDID_QUIRK_PREFER_LARGE_75 },
++
++	/* Panel in Samsung NP700G7A-S01PL notebook reports 6bpc */
++	{ "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC },
+ };
+ 
+ /*** DDC fetch and block validation ***/
+@@ -1782,6 +1787,9 @@ int drm_add_edid_modes(struct drm_connec
+ 
+ 	drm_add_display_info(edid, &connector->display_info);
+ 
++	if (quirks & EDID_QUIRK_FORCE_8BPC)
++		connector->display_info.bpc = 8;
++
+ 	return num_modes;
+ }
+ EXPORT_SYMBOL(drm_add_edid_modes);
diff --git a/queue-3.4/series b/queue-3.4/series
index 6fc7a29936f..2c90d5f3232 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -14,4 +14,5 @@ intel_idle-enable-ivb-xeon-support.patch
 ext4-fix-use-after-free-in-ext4_mb_new_blocks.patch
 ext4-check-for-overlapping-extents-in-ext4_valid_extent_entries.patch
 sched-rt-fix-rq-s-cpupri-leak-while-enqueue-dequeue-child-rt-entities.patch
+drm-edid-add-quirk-for-bpc-in-samsung-np700g7a-s01pl-notebook.patch
 net_dma-mark-broken.patch