Commit 4f60f06a authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Ankit Nautiyal
Browse files

drm/i915/hdcp: Convert intel_hdcp_enable to a blanket function 



Let's convert intel_hdcp_enable to a blanket function
which just has some conditions which needs to be checked
before connectors enable hdcp.
This cleans up code and avoids code duplication.

--v3
-Keep function name as intel_hdcp_enable() [Jani]

Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231026121139.987437-3-suraj.kandpal@intel.com
parent da36ce00

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

+1 −4
Original line number Diff line number Diff line
@@ -3259,9 +3259,6 @@ static void intel_enable_ddi(struct intel_atomic_state *state, 
	else

		intel_enable_ddi_dp(state, encoder, crtc_state, conn_state);



	/* Enable hdcp if it's desired */

	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED)

	intel_hdcp_enable(state, encoder, crtc_state, conn_state);

}

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

+1 −4
Original line number Diff line number Diff line
@@ -836,9 +836,6 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, 


	intel_audio_codec_enable(encoder, pipe_config, conn_state);



	/* Enable hdcp if it's desired */

	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED)

	intel_hdcp_enable(state, encoder, pipe_config, conn_state);

}

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

+16 −5
Original line number Diff line number Diff line
@@ -2324,7 +2324,7 @@ intel_hdcp_set_streams(struct intel_digital_port *dig_port, 
	return 0;

}



int intel_hdcp_enable(struct intel_atomic_state *state,

static int _intel_hdcp_enable(struct intel_atomic_state *state,

			      struct intel_encoder *encoder,

			      const struct intel_crtc_state *pipe_config,

			      const struct drm_connector_state *conn_state)
@@ -2404,6 +2404,17 @@ int intel_hdcp_enable(struct intel_atomic_state *state, 
	return ret;

}



void intel_hdcp_enable(struct intel_atomic_state *state,

		       struct intel_encoder *encoder,

		       const struct intel_crtc_state *crtc_state,

		       const struct drm_connector_state *conn_state)

{

	/* Enable hdcp if it's desired */

	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED)

		_intel_hdcp_enable(state, encoder, crtc_state, conn_state);

}



int intel_hdcp_disable(struct intel_connector *connector)

{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
@@ -2491,7 +2502,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, 
	}



	if (desired_and_not_enabled || content_protection_type_changed)

		intel_hdcp_enable(state, encoder, crtc_state, conn_state);

		_intel_hdcp_enable(state, encoder, crtc_state, conn_state);

}



void intel_hdcp_component_fini(struct drm_i915_private *i915)

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

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector, 
int intel_hdcp_init(struct intel_connector *connector,

		    struct intel_digital_port *dig_port,

		    const struct intel_hdcp_shim *hdcp_shim);

int intel_hdcp_enable(struct intel_atomic_state *state,

void intel_hdcp_enable(struct intel_atomic_state *state,

		       struct intel_encoder *encoder,

		       const struct intel_crtc_state *pipe_config,

		       const struct drm_connector_state *conn_state);