diff options
| author | Anshuman Gupta <anshuman.gupta@intel.com> | 2021-01-19 12:16:54 +0530 |
|---|---|---|
| committer | Anshuman Gupta <anshuman.gupta@intel.com> | 2021-01-22 16:03:11 +0530 |
| commit | 7fde594fd866dcec4d126fff9a284ccb2fe1266a (patch) | |
| tree | b37c0adce9253fa3c6fb9c62a943398a52c93d16 /drivers/gpu/drm/i915/display/intel_hdcp.c | |
| parent | fe7d52bccab674a22776a2f31236bf4232e85410 (diff) | |
| download | linux-7fde594fd866dcec4d126fff9a284ccb2fe1266a.tar.gz linux-7fde594fd866dcec4d126fff9a284ccb2fe1266a.tar.bz2 linux-7fde594fd866dcec4d126fff9a284ccb2fe1266a.zip | |
drm/i915/hdcp: Fix WARN_ON(data->k > INTEL_NUM_PIPES)
Initialize no. of streams transmitted on a port to zero
such that intel_hdcp_required_content_stream() can
prepared the content stream after subsequemt attmept to
enable hdcp after a HDCP failure.
v2:
- Initialize k at top level instead of else branch. [Jani]
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119064655.1605-2-anshuman.gupta@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_hdcp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index db8dff2eeb0a..581ccb038b87 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -53,6 +53,8 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port) bool enforce_type0 = false; int k; + data->k = 0; + if (dig_port->hdcp_auth_status) return 0; |