From: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: Fix error: uninitialized symbol 'ret'.
Date: Fri, 15 Jan 2021 19:18:25 +0530 [thread overview]
Message-ID: <20210115134825.29521-3-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20210115134825.29521-1-anshuman.gupta@intel.com>
Move (num_hdcp_streams > 0) condition to stream_encryption()
code block, where it actually belongs.
Cc: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
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 f24e2c07bfa6..3cc128787887 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);
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-15 14:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 13:48 [Intel-gfx] [PATCH 0/2] HDCP misc fixes Anshuman Gupta
2021-01-15 13:48 ` [Intel-gfx] [PATCH 1/2] drm/i915/hdcp: Fix WARN_ON(data->k > INTEL_NUM_PIPES) Anshuman Gupta
2021-01-15 15:18 ` Jani Nikula
2021-01-15 13:48 ` Anshuman Gupta [this message]
2021-01-15 19:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success for HDCP misc fixes Patchwork
2021-01-16 2:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210115134825.29521-3-anshuman.gupta@intel.com \
--to=anshuman.gupta@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox