summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch
new file mode 100644
index 00000000..85e0cad3
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0067-drm-radeon-fix-non-revealent-error-message.patch
@@ -0,0 +1,70 @@
1From 0521c32992bd885e150c17f413200d82fa83911c Mon Sep 17 00:00:00 2001
2From: Jerome Glisse <jglisse@redhat.com>
3Date: Tue, 17 Jul 2012 17:17:16 -0400
4Subject: [PATCH 67/73] drm/radeon: fix non revealent error message
5
6commit 8d1c702aa0b2c4b22b0742b72a1149d91690674b upstream.
7
8We want to print link status query failed only if it's
9an unexepected fail. If we query to see if we need
10link training it might be because there is nothing
11connected and thus link status query have the right
12to fail in that case.
13
14To avoid printing failure when it's expected, move the
15failure message to proper place.
16
17Signed-off-by: Jerome Glisse <jglisse@redhat.com>
18Signed-off-by: Dave Airlie <airlied@redhat.com>
19Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
20---
21 drivers/gpu/drm/radeon/atombios_dp.c | 10 +++++++---
22 1 files changed, 7 insertions(+), 3 deletions(-)
23
24diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
25index 552b436..3254d51 100644
26--- a/drivers/gpu/drm/radeon/atombios_dp.c
27+++ b/drivers/gpu/drm/radeon/atombios_dp.c
28@@ -22,6 +22,7 @@
29 *
30 * Authors: Dave Airlie
31 * Alex Deucher
32+ * Jerome Glisse
33 */
34 #include "drmP.h"
35 #include "radeon_drm.h"
36@@ -634,7 +635,6 @@ static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector,
37 ret = radeon_dp_aux_native_read(radeon_connector, DP_LANE0_1_STATUS,
38 link_status, DP_LINK_STATUS_SIZE, 100);
39 if (ret <= 0) {
40- DRM_ERROR("displayport link status failed\n");
41 return false;
42 }
43
44@@ -812,8 +812,10 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info)
45 else
46 mdelay(dp_info->rd_interval * 4);
47
48- if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status))
49+ if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {
50+ DRM_ERROR("displayport link status failed\n");
51 break;
52+ }
53
54 if (dp_clock_recovery_ok(dp_info->link_status, dp_info->dp_lane_count)) {
55 clock_recovery = true;
56@@ -875,8 +877,10 @@ static int radeon_dp_link_train_ce(struct radeon_dp_link_train_info *dp_info)
57 else
58 mdelay(dp_info->rd_interval * 4);
59
60- if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status))
61+ if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {
62+ DRM_ERROR("displayport link status failed\n");
63 break;
64+ }
65
66 if (dp_channel_eq_ok(dp_info->link_status, dp_info->dp_lane_count)) {
67 channel_eq = true;
68--
691.7.7.6
70