mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
drm/i915/hdcp: Assign correct hdcp content type
Currently hdcp->content_type is being assigned the content_type field
in drm_connector_state which is wrong and instead it needs to be
assigned hdcp_content_type field from drm_connector_state
Fixes: 4c4279a8d5 ("drm/i915/hdcp: add intel_atomic_state argument to hdcp_enable function")
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230622083254.2057102-1-suraj.kandpal@intel.com
This commit is contained in:
parent
ef0af9db2a
commit
86a124424e
|
|
@ -2358,7 +2358,7 @@ int intel_hdcp_enable(struct intel_atomic_state *state,
|
|||
mutex_lock(&dig_port->hdcp_mutex);
|
||||
drm_WARN_ON(&i915->drm,
|
||||
hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);
|
||||
hdcp->content_type = (u8)conn_state->content_type;
|
||||
hdcp->content_type = (u8)conn_state->hdcp_content_type;
|
||||
|
||||
if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
|
||||
hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user