Skip to content

Commit 49ad6e9

Browse files
surajk8tursulin
authored andcommitted
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: 4c4279a ("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 (cherry picked from commit 86a1244) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
1 parent 3e49de7 commit 49ad6e9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,7 @@ int intel_hdcp_enable(struct intel_atomic_state *state,
23582358
mutex_lock(&dig_port->hdcp_mutex);
23592359
drm_WARN_ON(&i915->drm,
23602360
hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);
2361-
hdcp->content_type = (u8)conn_state->content_type;
2361+
hdcp->content_type = (u8)conn_state->hdcp_content_type;
23622362

23632363
if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
23642364
hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;

0 commit comments

Comments
 (0)