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

Commit 6e43eb20 authored by Christopher Braga's avatar Christopher Braga
Browse files

drm/sde/hdcp: Update sink sync check to be disabled by default 



The DP standard leaves ambiguity to if sink synchronization
will be set before auxiliary protocols such as HDCP are to begin.
Update the dp_display HDCP worker  to check sink sync only if
explicitly instructed to via the new debugfs node 'hdcp_wait_sink_sync'

Change-Id: I4f4d0b14096aa3dc498e47de557de14092d37a58
Signed-off-by: default avatarChristopher Braga <cbraga@codeaurora.org>
parent 7b2ef2bf

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

+11 −0
Original line number Diff line number Diff line
@@ -1946,6 +1946,17 @@ static int dp_debug_init(struct dp_debug *dp_debug) 
		goto error_remove_dir;

	}



	file = debugfs_create_bool("hdcp_wait_sink_sync", 0644, dir,

			&debug->dp_debug.hdcp_wait_sink_sync);



	if (IS_ERR_OR_NULL(file)) {

		rc = PTR_ERR(file);

		pr_err("[%s] debugfs hdcp_wait_sink_sync failed, rc=%d\n",

		       DEBUG_NAME, rc);

		goto error_remove_dir;

	}





	file = debugfs_create_bool("dsc_feature_enable", 0644, dir,

			&debug->parser->dsc_feature_enable);

	if (IS_ERR_OR_NULL(file)) {

drivers/gpu/drm/msm/dp/dp_debug.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
/**

 * struct dp_debug

 * @debug_en: specifies whether debug mode enabled

 * @hdcp_wait_sink_sync: used to wait for sink synchronization before HDCP auth

 * @vdisplay: used to filter out vdisplay value

 * @hdisplay: used to filter out hdisplay value

 * @vrefresh: used to filter out vrefresh value
@@ -37,6 +38,7 @@ struct dp_debug { 
	bool sim_mode;

	bool psm_enabled;

	bool hdcp_disabled;

	bool hdcp_wait_sink_sync;

	int aspect_ratio;

	int vdisplay;

	int hdisplay;

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

+10 −6
Original line number Diff line number Diff line
@@ -355,13 +355,17 @@ static void dp_display_hdcp_cb_work(struct work_struct *work) 
		dp->hdcp_delayed_off = false;

	}



	drm_dp_dpcd_readb(dp->aux->drm_aux, DP_SINK_STATUS, &sink_status);

	sink_status &= (DP_RECEIVE_PORT_0_STATUS | DP_RECEIVE_PORT_1_STATUS);

	if (dp->debug->hdcp_wait_sink_sync) {

		drm_dp_dpcd_readb(dp->aux->drm_aux, DP_SINK_STATUS,

				&sink_status);

		sink_status &= (DP_RECEIVE_PORT_0_STATUS |

				DP_RECEIVE_PORT_1_STATUS);

		if (sink_status < 1) {

			pr_debug("Sink not synchronized. Queuing again then exiting\n");

			queue_delayed_work(dp->wq, &dp->hdcp_cb_work, HZ);

			return;

		}

	}



	status = &dp->link->hdcp_status;