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

Commit 4558ab4c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm: msm: dp: fix locking in hotplug processing"

parents e64efcbc 84f2b6f1

drivers/gpu/drm/msm/dp/dp_display.c

+1 −2
Original line number Diff line number Diff line
@@ -783,8 +783,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) 
	if (dp->is_connected) {

		pr_debug("dp already connected, skipping hpd high processing");

		mutex_unlock(&dp->session_lock);

		rc = -EISCONN;

		goto end;

		return -EISCONN;

	}



	dp->is_connected = true;

drivers/gpu/drm/msm/dp/dp_link.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1132,7 +1132,7 @@ static int dp_link_process_link_status_update(struct dp_link_private *link) 
		return -EINVAL;



	pr_debug("channel_eq_done = %d, clock_recovery_done = %d\n",

			drm_dp_clock_recovery_ok(link->link_status,

			drm_dp_channel_eq_ok(link->link_status,

			link->dp_link.link_params.lane_count),

			drm_dp_clock_recovery_ok(link->link_status,

			link->dp_link.link_params.lane_count));