From: Anshuman Gupta Date: Tue, 19 Jan 2021 06:46:54 +0000 (+0530) Subject: drm/i915/hdcp: Fix WARN_ON(data->k > INTEL_NUM_PIPES) X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fde594fd866dcec4d126fff9a284ccb2fe1266a;p=uclinux-h8%2Flinux.git 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 Signed-off-by: Anshuman Gupta Reviewed-by: Ankit Nautiyal Link: https://patchwork.freedesktop.org/patch/msgid/20210119064655.1605-2-anshuman.gupta@intel.com --- 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;