3.4-stable patches

added patches:
	drm-radeon-atom-fix-dithering-on-certain-panels.patch
	drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch

diff --git a/queue-3.4/drm-radeon-atom-fix-dithering-on-certain-panels.patch b/queue-3.4/drm-radeon-atom-fix-dithering-on-certain-panels.patch
new file mode 100644 (file)
index 0000000..b1b6dc3
--- /dev/null
+++ b/queue-3.4/drm-radeon-atom-fix-dithering-on-certain-panels.patch
@@ -0,0 +1,38 @@
+From 642528355c694f5ed68f6bff9ff520326a249f99 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 27 May 2014 16:40:51 -0400
+Subject: drm/radeon/atom: fix dithering on certain panels
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 642528355c694f5ed68f6bff9ff520326a249f99 upstream.
+
+We need to specify the encoder mode as LVDS for eDP
+when using the Crtc_Source atom table in order to properly
+set up the FMT hardware.
+
+bug:
+https://bugs.freedesktop.org/show_bug.cgi?id=73911
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/atombios_encoders.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/atombios_encoders.c
++++ b/drivers/gpu/drm/radeon/atombios_encoders.c
+@@ -1666,8 +1666,11 @@ atombios_set_encoder_crtc_source(struct
+                                       args.v2.ucEncodeMode = ATOM_ENCODER_MODE_CRT;
+                               else
+                                       args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder);
+-                      } else
++                      } else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
++                              args.v2.ucEncodeMode = ATOM_ENCODER_MODE_LVDS;
++                      } else {
+                               args.v2.ucEncodeMode = atombios_get_encoder_mode(encoder);
++                      }
+                       switch (radeon_encoder->encoder_id) {
+                       case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+                       case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

diff --git a/queue-3.4/drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch b/queue-3.4/drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch
new file mode 100644 (file)
index 0000000..66979f1
--- /dev/null
+++ b/queue-3.4/drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch
@@ -0,0 +1,31 @@
+From af5d36539dfe043f1cf0f8b7334d6bb12cd14e75 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 27 May 2014 13:11:36 -0400
+Subject: drm/radeon: fix typo in radeon_connector_is_dp12_capable()
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit af5d36539dfe043f1cf0f8b7334d6bb12cd14e75 upstream.
+
+We were checking the ext clock rather than the display clock.
+
+Noticed by ArtForz on IRC.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_connectors.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_connectors.c
++++ b/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -1279,7 +1279,7 @@ bool radeon_connector_is_dp12_capable(st
+       struct radeon_device *rdev = dev->dev_private;
+ 
+       if (ASIC_IS_DCE5(rdev) &&
+-          (rdev->clock.dp_extclk >= 53900) &&
++          (rdev->clock.default_dispclk >= 53900) &&
+           radeon_connector_encoder_is_hbr2(connector)) {
+               return true;
+       }

diff --git a/queue-3.4/series b/queue-3.4/series
index aad2429b0a86037248201e7b7607591c1733880b..fd5c4c95075a5d08556a05c7c05cbbd51710cbf6 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -10,3 +10,5 @@ rt2x00-disable-tkip-on-usb.patch
 rt2x00-fix-rfkill-regression-on-rt2500pci.patch
 mtd-pxa3xx_nand-make-the-driver-work-on-big-endian-systems.patch
 drm-radeon-only-apply-hdmi-bpc-pll-flags-when-encoder-mode-is-hdmi.patch
+drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch
+drm-radeon-atom-fix-dithering-on-certain-panels.patch