From patchwork Tue Jan 19 06:46:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Anshuman" X-Patchwork-Id: 12029231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F03B9C433E6 for ; Tue, 19 Jan 2021 07:01:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A29392312C for ; Tue, 19 Jan 2021 07:01:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A29392312C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E93BA6E826; Tue, 19 Jan 2021 07:01:35 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF24F6E826 for ; Tue, 19 Jan 2021 07:01:34 +0000 (UTC) IronPort-SDR: 8HfNTNpfGA7mscMqPQL+YCvXBvX93B/p9EN4lwvX37dl9jhpxeOhDj+UTKawZ+fEaX5iLWXjOX Gryi+8DidyUw== X-IronPort-AV: E=McAfee;i="6000,8403,9868"; a="178108412" X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="178108412" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2021 23:01:32 -0800 IronPort-SDR: 8BoHfKhbY1WwtLQgfK99NAC5tGJJQZgOS98uVKSGm19ZBAhIXrzlz6BZwFF/kOhO0EBJvCXjtC G03kE3I7zBTQ== X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="500853937" Received: from unknown (HELO genxfsim-desktop.iind.intel.com) ([10.223.74.179]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2021 23:01:31 -0800 From: Anshuman Gupta To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Jan 2021 12:16:55 +0530 Message-Id: <20210119064655.1605-3-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210119064655.1605-1-anshuman.gupta@intel.com> References: <20210119064655.1605-1-anshuman.gupta@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 2/2] drm/i915/hdcp: Fix uninitialized symbol X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Move (num_hdcp_streams > 0) condition to stream_encryption() code block, where it actually belongs. This fixes the static analysis error of uninitialized symbol 'ret'. Cc: Ramalingam C Signed-off-by: Anshuman Gupta Reviewed-by: Ankit Nautiyal --- drivers/gpu/drm/i915/display/intel_hdcp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 581ccb038b87..9ca0d67b10f5 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -878,15 +878,15 @@ static int _intel_hdcp_disable(struct intel_connector *connector) } drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 transcoder: %s stream encryption disabled\n", transcoder_name(hdcp->stream_transcoder)); + /* + * If there are other connectors on this port using HDCP, + * don't disable it until it disabled HDCP encryption for + * all connectors in MST topology. + */ + if (dig_port->num_hdcp_streams > 0) + return ret; } - /* - * If there are other connectors on this port using HDCP, don't disable it - * until it disabled HDCP encryption for all connectors in MST topology. - */ - if (dig_port->num_hdcp_streams > 0) - return ret; - hdcp->hdcp_encrypted = false; intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0); if (intel_de_wait_for_clear(dev_priv, @@ -1947,10 +1947,10 @@ static int _intel_hdcp2_disable(struct intel_connector *connector) } drm_dbg_kms(&i915->drm, "HDCP 2.2 transcoder: %s stream encryption disabled\n", transcoder_name(hdcp->stream_transcoder)); - } - if (dig_port->num_hdcp_streams > 0) - return ret; + if (dig_port->num_hdcp_streams > 0) + return ret; + } ret = hdcp2_disable_encryption(connector);