niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/hdcp: add intel_atomic_state argument to hdcp_enable function

Browse source 
Pass all the parameter in intel_encoder->enable()
to intel_hdcp_enable as we need intel_atomic_state
later down to get acquire_ctx.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230515103225.688830-2-suraj.kandpal@intel.com
This commit is contained in:
Suraj Kandpal 2023-05-15 16:02:22 +05:30 • committed by Animesh Manna
parent 2b874a0278
commit 4c4279a8d5
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_ddi.c
View file

@ -3264,9 +3264,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
/* Enable hdcp if it's desired */ /* Enable hdcp if it's desired */
if (conn_state->content_protection == if (conn_state->content_protection ==
DRM_MODE_CONTENT_PROTECTION_DESIRED) DRM_MODE_CONTENT_PROTECTION_DESIRED)
intel_hdcp_enable(to_intel_connector(conn_state->connector), intel_hdcp_enable(state, encoder, crtc_state, conn_state);
crtc_state,
(u8)conn_state->hdcp_content_type);
} }
static void intel_disable_ddi_dp(struct intel_atomic_state *state, static void intel_disable_ddi_dp(struct intel_atomic_state *state,

4
drivers/gpu/drm/i915/display/intel_dp_mst.c
View file

@ -801,9 +801,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
/* Enable hdcp if it's desired */ /* Enable hdcp if it's desired */
if (conn_state->content_protection == if (conn_state->content_protection ==
DRM_MODE_CONTENT_PROTECTION_DESIRED) DRM_MODE_CONTENT_PROTECTION_DESIRED)
intel_hdcp_enable(to_intel_connector(conn_state->connector), intel_hdcp_enable(state, encoder, pipe_config, conn_state);
pipe_config,
(u8)conn_state->hdcp_content_type);
} }
static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,

16
drivers/gpu/drm/i915/display/intel_hdcp.c
View file

@ -2332,10 +2332,14 @@ int intel_hdcp_init(struct intel_connector *connector,
return 0; return 0;
} }
int intel_hdcp_enable(struct intel_connector *connector, int intel_hdcp_enable(struct intel_atomic_state *state,
const struct intel_crtc_state *pipe_config, u8 content_type) struct intel_encoder *encoder,
const struct intel_crtc_state *pipe_config,
const struct drm_connector_state *conn_state)
{ {
struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
struct intel_connector *connector =
to_intel_connector(conn_state->connector);
struct intel_digital_port *dig_port = intel_attached_dig_port(connector); struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct intel_hdcp *hdcp = &connector->hdcp; struct intel_hdcp *hdcp = &connector->hdcp;
unsigned long check_link_interval = DRM_HDCP_CHECK_PERIOD_MS; unsigned long check_link_interval = DRM_HDCP_CHECK_PERIOD_MS;
@ -2354,7 +2358,7 @@ int intel_hdcp_enable(struct intel_connector *connector,
mutex_lock(&dig_port->hdcp_mutex); mutex_lock(&dig_port->hdcp_mutex);
drm_WARN_ON(&dev_priv->drm, drm_WARN_ON(&dev_priv->drm,
hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED); hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);
hdcp->content_type = content_type; hdcp->content_type = (u8)conn_state->content_type;
if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) { if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
hdcp->cpu_transcoder = pipe_config->mst_master_transcoder; hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;
@ -2485,9 +2489,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
} }
if (desired_and_not_enabled || content_protection_type_changed) if (desired_and_not_enabled || content_protection_type_changed)
intel_hdcp_enable(connector, intel_hdcp_enable(state, encoder, crtc_state, conn_state);
crtc_state,
(u8)conn_state->hdcp_content_type);
} }
void intel_hdcp_component_fini(struct drm_i915_private *dev_priv) void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)

6
drivers/gpu/drm/i915/display/intel_hdcp.h
View file

@ -28,8 +28,10 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,
int intel_hdcp_init(struct intel_connector *connector, int intel_hdcp_init(struct intel_connector *connector,
struct intel_digital_port *dig_port, struct intel_digital_port *dig_port,
const struct intel_hdcp_shim *hdcp_shim); const struct intel_hdcp_shim *hdcp_shim);
int intel_hdcp_enable(struct intel_connector *connector, int intel_hdcp_enable(struct intel_atomic_state *state,
const struct intel_crtc_state *pipe_config, u8 content_type); struct intel_encoder *encoder,
const struct intel_crtc_state *pipe_config,
const struct drm_connector_state *conn_state);
int intel_hdcp_disable(struct intel_connector *connector); int intel_hdcp_disable(struct intel_connector *connector);
void intel_hdcp_update_pipe(struct intel_atomic_state *state, void intel_hdcp_update_pipe(struct intel_atomic_state *state,
struct intel_encoder *encoder, struct intel_encoder *encoder,