From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Chris Wilson <chris@chris-wilson.co.uk>,
Sean Paul <seanpaul@chromium.org>
Subject: [Intel-gfx] [PATCH] drm/i915/display: Set error value before returning in intel_hdcp*_disable()
Date: Fri, 15 Jan 2021 09:20:34 +0000 [thread overview]
Message-ID: <20210115092034.8804-1-chris@chris-wilson.co.uk> (raw)
drivers/gpu/drm/i915/display/intel_hdcp.c:886 _intel_hdcp_disable() error: uninitialized symbol 'ret'.
drivers/gpu/drm/i915/display/intel_hdcp.c:1951 _intel_hdcp2_disable() error: uninitialized symbol 'ret'.
Given the comment that this error reflects the status of all connectors
within this MST topology, I opted to use -EBUSY to indicate not all were
ready.
Fixes: 2a743b7b8a8b ("drm/i915/hdcp: Configure HDCP1.4 MST steram encryption status")
Fixes: 899c8762f981 ("drm/i915/hdcp: Configure HDCP2.2 MST steram encryption status")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index db8dff2eeb0a..2be4822b91a0 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -883,7 +883,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
* until it disabled HDCP encryption for all connectors in MST topology.
*/
if (dig_port->num_hdcp_streams > 0)
- return ret;
+ return -EBUSY;
hdcp->hdcp_encrypted = false;
intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
@@ -1948,7 +1948,7 @@ static int _intel_hdcp2_disable(struct intel_connector *connector)
}
if (dig_port->num_hdcp_streams > 0)
- return ret;
+ return -EBUSY;
ret = hdcp2_disable_encryption(connector);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2021-01-15 9:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 9:20 Chris Wilson [this message]
2021-01-15 10:35 ` [Intel-gfx] [PATCH] drm/i915/display: Set error value before returning in intel_hdcp*_disable() Jani Nikula
2021-01-15 12:08 ` Gupta, Anshuman
2021-01-15 14:06 ` Gupta, Anshuman
2021-01-15 11:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-15 12:15 ` [Intel-gfx] [PATCH v2] drm/i915/display: Set return " Chris Wilson
2021-01-15 15:51 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: Set error " Patchwork
2021-01-15 16:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Set error value before returning in intel_hdcp*_disable() (rev2) Patchwork
2021-01-15 22:56 ` [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=20210115092034.8804-1-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=seanpaul@chromium.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.