[kernel/f21] Fix blank screen after resume with various radeon devices (rhbz 1069027)

[Josh Boyer]

commit 572f0b80167b0536ec7fa6069c5422cd3d213f54
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Mar 11 10:33:13 2015 -0400

    Fix blank screen after resume with various radeon devices (rhbz 1069027)

 ...dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch | 37 ++++++++++++++++++++++
 kernel.spec                                        |  7 ++++
 2 files changed, 44 insertions(+)
---
diff --git a/drm-radeon-dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch b/drm-radeon-dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch
new file mode 100644
index 0000000..0a0abd2
--- /dev/null
+++ b/drm-radeon-dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch
@@ -0,0 +1,37 @@
+From: Alex Deucher <alexander.deucher at amd.com>
+Date: Wed, 11 Feb 2015 18:34:36 -0500
+Subject: [PATCH] drm/radeon/dp: Set EDP_CONFIGURATION_SET for bridge chips if
+ necessary
+
+Don't restrict it to just eDP panels.  Some LVDS bridge chips require
+this.  Fixes blank panels on resume on certain laptops.  Noticed
+by mrnuke on IRC.
+
+bug:
+https://bugs.freedesktop.org/show_bug.cgi?id=42960
+
+Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
+Cc: stable at vger.kernel.org
+---
+ drivers/gpu/drm/radeon/atombios_dp.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
+index db42a670f995..5bf825dfaa09 100644
+--- a/drivers/gpu/drm/radeon/atombios_dp.c
++++ b/drivers/gpu/drm/radeon/atombios_dp.c
+@@ -623,10 +623,8 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
+ 		drm_dp_dpcd_writeb(dp_info->aux,
+ 				   DP_DOWNSPREAD_CTRL, 0);
+ 
+-	if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
+-	    (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
++	if (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)
+ 		drm_dp_dpcd_writeb(dp_info->aux, DP_EDP_CONFIGURATION_SET, 1);
+-	}
+ 
+ 	/* set the lane count on the sink */
+ 	tmp = dp_info->dp_lane_count;
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 85c5689..e63f87c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -667,6 +667,9 @@ Patch26163: Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
 #CVE-2015-2150 rhbz 1196266 1200397
 Patch26165: xen-pciback-limit-guest-control-of-command-register.patch
 
+#rhbz 1069027
+Patch26166: drm-radeon-dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1439,6 +1442,9 @@ ApplyPatch Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
 #CVE-2015-2150 rhbz 1196266 1200397
 ApplyPatch xen-pciback-limit-guest-control-of-command-register.patch
 
+#rhbz 1069027
+ApplyPatch drm-radeon-dp-Set-EDP_CONFIGURATION_SET-for-bridge-c.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2310,6 +2316,7 @@ fi
 #                                    ||     ||
 %changelog
 * Wed Mar 11 2015 Josh Boyer <jwboyer at fedoraproject.org>
+- Fix blank screen after resume with various radeon devices (rhbz 1069027)
 - CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
 - Patch series to fix Lenovo *40 and Carbon X1 touchpads (rhbz 1200777 1200778)