Commit 5758e073 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hdcp: move update pipe code to hdcp 



The DDI encoder code shouln't have to know about the guts of
HDCP. Abstract the pipe update code to a new intel_hdcp_update_pipe() in
intel_hdcp.c. No functional changes.

Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200128163803.5954-1-jani.nikula@intel.com
parent 816cc4d6

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −33
Original line number Diff line number Diff line
@@ -4080,43 +4080,11 @@ static void intel_ddi_update_pipe(struct intel_encoder *encoder, 
				  const struct intel_crtc_state *crtc_state,

				  const struct drm_connector_state *conn_state)

{

	struct intel_connector *connector =

				to_intel_connector(conn_state->connector);

	struct intel_hdcp *hdcp = &connector->hdcp;

	bool content_protection_type_changed =

			(conn_state->hdcp_content_type != hdcp->content_type &&

			 conn_state->content_protection !=

			 DRM_MODE_CONTENT_PROTECTION_UNDESIRED);



	if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))

		intel_ddi_update_pipe_dp(encoder, crtc_state, conn_state);



	/*

	 * During the HDCP encryption session if Type change is requested,

	 * disable the HDCP and reenable it with new TYPE value.

	 */

	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_UNDESIRED ||

	    content_protection_type_changed)

		intel_hdcp_disable(connector);



	/*

	 * Mark the hdcp state as DESIRED after the hdcp disable of type

	 * change procedure.

	 */

	if (content_protection_type_changed) {

		mutex_lock(&hdcp->mutex);

		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;

		schedule_work(&hdcp->prop_work);

		mutex_unlock(&hdcp->mutex);

	}



	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED ||

	    content_protection_type_changed)

		intel_hdcp_enable(connector,

				  crtc_state->cpu_transcoder,

				  (u8)conn_state->hdcp_content_type);

	intel_hdcp_update_pipe(encoder, crtc_state, conn_state);

}



static void

drivers/gpu/drm/i915/display/intel_hdcp.c

+40 −0
Original line number Diff line number Diff line
@@ -2050,6 +2050,46 @@ int intel_hdcp_disable(struct intel_connector *connector) 
	return ret;

}



void intel_hdcp_update_pipe(struct intel_encoder *encoder,

			    const struct intel_crtc_state *crtc_state,

			    const struct drm_connector_state *conn_state)

{

	struct intel_connector *connector =

				to_intel_connector(conn_state->connector);

	struct intel_hdcp *hdcp = &connector->hdcp;

	bool content_protection_type_changed =

		(conn_state->hdcp_content_type != hdcp->content_type &&

		 conn_state->content_protection !=

		 DRM_MODE_CONTENT_PROTECTION_UNDESIRED);



	/*

	 * During the HDCP encryption session if Type change is requested,

	 * disable the HDCP and reenable it with new TYPE value.

	 */

	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_UNDESIRED ||

	    content_protection_type_changed)

		intel_hdcp_disable(connector);



	/*

	 * Mark the hdcp state as DESIRED after the hdcp disable of type

	 * change procedure.

	 */

	if (content_protection_type_changed) {

		mutex_lock(&hdcp->mutex);

		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;

		schedule_work(&hdcp->prop_work);

		mutex_unlock(&hdcp->mutex);

	}



	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED ||

	    content_protection_type_changed)

		intel_hdcp_enable(connector,

				  crtc_state->cpu_transcoder,

				  (u8)conn_state->hdcp_content_type);

}



void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)

{

	mutex_lock(&dev_priv->hdcp_comp_mutex);

drivers/gpu/drm/i915/display/intel_hdcp.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ struct drm_connector; 
struct drm_connector_state;

struct drm_i915_private;

struct intel_connector;

struct intel_crtc_state;

struct intel_encoder;

struct intel_hdcp_shim;

enum port;

enum transcoder;
@@ -26,6 +28,9 @@ int intel_hdcp_init(struct intel_connector *connector, 
int intel_hdcp_enable(struct intel_connector *connector,

		      enum transcoder cpu_transcoder, u8 content_type);

int intel_hdcp_disable(struct intel_connector *connector);

void intel_hdcp_update_pipe(struct intel_encoder *encoder,

			    const struct intel_crtc_state *crtc_state,

			    const struct drm_connector_state *conn_state);

bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);

bool intel_hdcp_capable(struct intel_connector *connector);

bool intel_hdcp2_capable(struct intel_connector *connector);

CRA Git | Maintained and supported by SUSTech CRA and CCSE