OSDN Git Service

drm/i915/hdcp: Fix WARN_ON(data->k > INTEL_NUM_PIPES)
authorAnshuman Gupta <anshuman.gupta@intel.com>
Tue, 19 Jan 2021 06:46:54 +0000 (12:16 +0530)
committerAnshuman Gupta <anshuman.gupta@intel.com>
Fri, 22 Jan 2021 10:33:11 +0000 (16:03 +0530)
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
drivers/gpu/drm/i915/display/intel_hdcp.c

index db8dff2..581ccb0 100644 (file)
@@ -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;