From: Ramalingam C <ramalingam.c@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
seanpaul@chromium.org, daniel.vetter@ffwll.ch
Subject: [PATCH 4/4] drm/i915: Increase timeout for Encrypt status change
Date: Tue, 27 Nov 2018 19:32:59 +0530 [thread overview]
Message-ID: <1543327379-22629-5-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1543327379-22629-1-git-send-email-ramalingam.c@intel.com>
At enable/disable of the HDCP encryption, for encryption status change
we need minimum one frame duration. And we might program this bit any
point(start/End) in the previous frame.
With 20mSec, observed the timeout for change in encryption status.
Since this is not time critical operation and we need to hold on
until the status is changed, fixing the timeout to 50mSec. (Based on
trial and error method!)
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
drivers/gpu/drm/i915/intel_hdcp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index bd60d0e7bbfa..156b14d19e09 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -15,6 +15,7 @@
#include "i915_reg.h"
#define KEY_LOAD_TRIES 5
+#define TIME_FOR_ENCRYPT_STATUS_CHANGE 50
static
bool intel_hdcp_is_ksv_valid(u8 *ksv)
@@ -638,7 +639,8 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port,
/* Wait for encryption confirmation */
if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port),
- HDCP_STATUS_ENC, HDCP_STATUS_ENC, 20)) {
+ HDCP_STATUS_ENC, HDCP_STATUS_ENC,
+ TIME_FOR_ENCRYPT_STATUS_CHANGE)) {
DRM_ERROR("Timed out waiting for encryption\n");
return -ETIMEDOUT;
}
@@ -668,7 +670,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
I915_WRITE(PORT_HDCP_CONF(port), 0);
if (intel_wait_for_register(dev_priv, PORT_HDCP_STATUS(port), ~0, 0,
- 20)) {
+ TIME_FOR_ENCRYPT_STATUS_CHANGE)) {
DRM_ERROR("Failed to disable HDCP, timeout clearing status\n");
return -ETIMEDOUT;
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-11-27 14:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 14:02 [PATCH 0/4] HDCP1.4 fixes Ramalingam C
2018-11-27 14:02 ` [PATCH 1/4] drm/i915: Fix GEN9 HDCP1.4 key load process Ramalingam C
2018-11-27 15:15 ` Ville Syrjälä
2018-11-27 16:27 ` [Intel-gfx] " C, Ramalingam
2018-11-28 14:00 ` [PATCH v2 " Ramalingam C
2018-12-03 14:23 ` [PATCH " Sean Paul
2018-11-27 14:02 ` [PATCH 2/4] drm/i915: Fix platform coverage for HDCP1.4 Ramalingam C
2018-12-03 14:23 ` Sean Paul
2018-11-27 14:02 ` [PATCH 3/4] drm/i915: debug log for REPLY_ACK missing Ramalingam C
2018-12-03 14:26 ` Sean Paul
2018-11-27 14:02 ` Ramalingam C [this message]
2018-12-03 14:27 ` [PATCH 4/4] drm/i915: Increase timeout for Encrypt status change Sean Paul
2018-11-27 14:36 ` ✓ Fi.CI.BAT: success for HDCP1.4 fixes (rev8) Patchwork
2018-11-27 17:52 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-28 16:10 ` ✓ Fi.CI.BAT: success for HDCP1.4 fixes (rev9) Patchwork
2018-11-29 0:10 ` ✓ Fi.CI.IGT: " Patchwork
2018-12-03 10:08 ` [PATCH 0/4] HDCP1.4 fixes C, Ramalingam
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=1543327379-22629-5-git-send-email-ramalingam.c@intel.com \
--to=ramalingam.c@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--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.