drm/rockchip: dw-dp: enable hdcp after enable video stream

In DisplayPort HDCP1.3 CTS case 1A-01 page 10, unencrypted video
signal should be sent before enable hdcp.
In DisplayPort HDCP2.2 CTS case 1A-1 page 12, unencrypted video
signal may be sent before enable hdcp.

Change-Id: I12f5ec4143728683663cba5a0f079c915c500383
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
This commit is contained in:
Zhang Yubing
2024-04-10 17:44:33 +08:00
committed by Tao Huang
parent eec3ea3cc7
commit 86c5457a7e

View File

@@ -4150,9 +4150,6 @@ static void dw_dp_bridge_atomic_enable(struct drm_bridge *bridge,
return;
}
if (conn_state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED)
dw_dp_hdcp_enable(dp, conn_state->hdcp_content_type);
ret = dw_dp_video_enable(dp, &dp->video, 0);
if (ret < 0) {
dev_err(dp->dev, "failed to enable video: %d\n", ret);
@@ -4160,6 +4157,8 @@ static void dw_dp_bridge_atomic_enable(struct drm_bridge *bridge,
}
dw_dp_enable_vop_gate(dp, bridge->encoder->crtc, dp->id, true);
if (conn_state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED)
dw_dp_hdcp_enable(dp, conn_state->hdcp_content_type);
if (dp->panel)
drm_panel_enable(dp->panel);