MLK-20961 drm: imx: hdp: Check the content protection property first.

Need to check the content protection property first in
imx_hdp_imx_encoder_enable. The function may return if
drm_hdmi_infoframe_set_hdr_metadata returns an error. This was preventing
iMX8QM from enabling content protection.

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>

drivers/gpu/drm/imx/hdp/imx-hdp.c

@@ -1065,6 +1065,10 @@ static void imx_hdp_imx_encoder_enable(struct drm_encoder *encoder)
 	struct drm_connector_state *conn_state = hdp->connector.state;
 	int ret = 0;
 
+	if (conn_state->content_protection ==
+	    DRM_MODE_CONTENT_PROTECTION_DESIRED)
+		imx_hdcp_enable(hdp);
+
 	if (!hdp->ops->write_hdr_metadata)
 		goto out;
 
@@ -1093,10 +1097,6 @@ static void imx_hdp_imx_encoder_enable(struct drm_encoder *encoder)
 
 	hdp->ops->write_hdr_metadata(&hdp->state, &frame);
 
-	if (conn_state->content_protection ==
-	    DRM_MODE_CONTENT_PROTECTION_DESIRED)
-		imx_hdcp_enable(hdp);
-
 out:
 	imx_hdp_call(hdp, pixel_link_validate, &hdp->state);
 	imx_hdp_call(hdp, pixel_link_sync_ctrl_enable, &hdp->state);