Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d1c702a authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon: fix non revealent error message 



We want to print link status query failed only if it's
an unexepected fail. If we query to see if we need
link training it might be because there is nothing
connected and thus link status query have the right
to fail in that case.

To avoid printing failure when it's expected, move the
failure message to proper place.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1e179d4e

drivers/gpu/drm/radeon/atombios_dp.c

+7 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 *

 * Authors: Dave Airlie

 *          Alex Deucher

 *          Jerome Glisse

 */

#include "drmP.h"

#include "radeon_drm.h"
@@ -654,7 +655,6 @@ static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector, 
	ret = radeon_dp_aux_native_read(radeon_connector, DP_LANE0_1_STATUS,

					link_status, DP_LINK_STATUS_SIZE, 100);

	if (ret <= 0) {

		DRM_ERROR("displayport link status failed\n");

		return false;

	}
@@ -833,8 +833,10 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info) 
		else

			mdelay(dp_info->rd_interval * 4);



		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status))

		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {

			DRM_ERROR("displayport link status failed\n");

			break;

		}



		if (dp_clock_recovery_ok(dp_info->link_status, dp_info->dp_lane_count)) {

			clock_recovery = true;
@@ -896,8 +898,10 @@ static int radeon_dp_link_train_ce(struct radeon_dp_link_train_info *dp_info) 
		else

			mdelay(dp_info->rd_interval * 4);



		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status))

		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {

			DRM_ERROR("displayport link status failed\n");

			break;

		}



		if (dp_channel_eq_ok(dp_info->link_status, dp_info->dp_lane_count)) {

			channel_eq = true;