Commit 0d9a947b authored by Qingqing Zhuo's avatar Qingqing Zhuo Committed by Alex Deucher
Browse files

drm/amd/display: Fix unstable HPCP compliance on Chrome Barcelo 



[Why]
Intermittently, there presents two occurrences of 0 stream
commits in a single HPD event. Current HDCP sequence does
not consider such scenerio, and will thus disable HDCP.

[How]
Add condition check to include stream remove and re-enable
case for HDCP enable.

Reviewed-by: default avatarBhawanpreet Lakha <bhawanpreet.lakha@amd.com>
Acked-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Signed-off-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 68e1634d

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+20 −2
Original line number Diff line number Diff line
@@ -8365,8 +8365,26 @@ static bool is_content_protection_different(struct drm_connector_state *state, 
	    state->content_protection == DRM_MODE_CONTENT_PROTECTION_ENABLED)

		state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED;



	/* Check if something is connected/enabled, otherwise we start hdcp but nothing is connected/enabled

	 * hot-plug, headless s3, dpms

	/* Stream removed and re-enabled

	 *

	 * Can sometimes overlap with the HPD case,

	 * thus set update_hdcp to false to avoid

	 * setting HDCP multiple times.

	 *

	 * Handles:	DESIRED -> DESIRED (Special case)

	 */

	if (!(old_state->crtc && old_state->crtc->enabled) &&

		state->crtc && state->crtc->enabled &&

		connector->state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED) {

		dm_con_state->update_hdcp = false;

		return true;

	}



	/* Hot-plug, headless s3, dpms

	 *

	 * Only start HDCP if the display is connected/enabled.

	 * update_hdcp flag will be set to false until the next

	 * HPD comes in.

	 *

	 * Handles:	DESIRED -> DESIRED (Special case)

	 */