github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 14:12:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/hdcp: Use HDCP2_STREAM_STATUS instead of HDCP2_AUTH_STREAM

Browse Source 
From PTL we need to move to using HDCP2_STREAM_STATUS as a WARN_ON
to see if written content type info is not the same since
HDCP2_AUTH_STREAM is inaccessible to us now.

--v2
-Fix commit message [Jani]

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250619113340.3379200-3-suraj.kandpal@intel.com
This commit is contained in:
Suraj Kandpal 2025-06-19 17:03:40 +05:30
parent b8c01389b8
commit c4c1a91530
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
View File

@ -808,10 +808,13 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,
u32 val;
u8 stream_type;
val = intel_de_read(display, HDCP2_AUTH_STREAM(display, cpu_transcoder, port));
stream_type = REG_FIELD_GET(AUTH_STREAM_TYPE_MASK, val);
drm_WARN_ON(display->drm, enable &&
stream_type != data->streams[0].stream_type);
if (DISPLAY_VER(display) < 30) {
val = intel_de_read(display,
HDCP2_AUTH_STREAM(display, cpu_transcoder, port));
stream_type = REG_FIELD_GET(AUTH_STREAM_TYPE_MASK, val);
drm_WARN_ON(display->drm, enable &&
stream_type != data->streams[0].stream_type);
}
ret = intel_dp_mst_toggle_hdcp_stream_select(connector, enable);
if (ret)
@ -827,6 +830,14 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,
return -ETIMEDOUT;
}
if (DISPLAY_VER(display) >= 30) {
val = intel_de_read(display,
HDCP2_STREAM_STATUS(display, cpu_transcoder, port));
stream_type = REG_FIELD_GET(STREAM_TYPE_STATUS_MASK, val);
drm_WARN_ON(display->drm, enable &&
stream_type != data->streams[0].stream_type);
}
return 0;
}

2
drivers/gpu/drm/i915/display/intel_hdcp_regs.h
View File

@ -247,7 +247,7 @@
_TRANSA_HDCP2_STREAM_STATUS, \
_TRANSB_HDCP2_STREAM_STATUS)
#define STREAM_ENCRYPTION_STATUS REG_BIT(31)
#define STREAM_TYPE_STATUS REG_BIT(30)
#define STREAM_TYPE_STATUS_MASK REG_GENMASK(30, 30)
#define HDCP2_STREAM_STATUS(dev_priv, trans, port) \
(TRANS_HDCP(dev_priv) ? \
TRANS_HDCP2_STREAM_STATUS(trans) : \