From: Anshuman Gupta <anshuman.gupta@intel.com>
To: Ramalingam C <ramalingam.c@intel.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH v2 4/5] drm/i915: dont retry stream management at seq_num_m roll over
Date: Thu, 13 Feb 2020 16:07:46 +0530 [thread overview]
Message-ID: <20200213103746.GB11041@intel.com> (raw)
In-Reply-To: <20200212102942.26568-5-ramalingam.c@intel.com>
On 2020-02-12 at 15:59:41 +0530, Ramalingam C wrote:
> When roll over detected for seq_num_m, we shouldn't continue with stream
> management with rolled over value.
>
> So we are terminating the stream management retry, on roll over of the
> seq_num_m.
>
> v2:
> using drm_dbg_kms instead of DRM_DEBUG_KMS [Anshuman]
> v3:
> dev_priv is used as i915 [JaniN]
>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index b24d12efae0a..b35f50d4a0e9 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1419,11 +1419,6 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector)
>
> err_exit:
> hdcp->seq_num_m++;
> - if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
> - DRM_DEBUG_KMS("seq_num_m roll over.\n");
> - ret = -1;
> - }
> -
> return ret;
> }
>
> @@ -1618,8 +1613,11 @@ hdcp2_propagate_stream_management_info(struct intel_connector *connector)
>
> for (i = 0; i < tries; i++) {
> ret = _hdcp2_propagate_stream_management_info(connector);
> - if (!ret)
> + if (!ret || connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
> + if (connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX)
> + drm_dbg_kms(&i915->drm, "seq_num_m roll over.\n");
> break;
> + }
Tested this with HDCP Comp tool.
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Tested-by: Anshuman Gupta <anshuman.gupta@intel.com>
>
> drm_dbg_kms(&i915->drm,
> "HDCP2 stream management %d of %d Failed.(%d)\n",
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Anshuman Gupta <anshuman.gupta@intel.com>
To: Ramalingam C <ramalingam.c@intel.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH v2 4/5] drm/i915: dont retry stream management at seq_num_m roll over
Date: Thu, 13 Feb 2020 16:07:46 +0530 [thread overview]
Message-ID: <20200213103746.GB11041@intel.com> (raw)
In-Reply-To: <20200212102942.26568-5-ramalingam.c@intel.com>
On 2020-02-12 at 15:59:41 +0530, Ramalingam C wrote:
> When roll over detected for seq_num_m, we shouldn't continue with stream
> management with rolled over value.
>
> So we are terminating the stream management retry, on roll over of the
> seq_num_m.
>
> v2:
> using drm_dbg_kms instead of DRM_DEBUG_KMS [Anshuman]
> v3:
> dev_priv is used as i915 [JaniN]
>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index b24d12efae0a..b35f50d4a0e9 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -1419,11 +1419,6 @@ int _hdcp2_propagate_stream_management_info(struct intel_connector *connector)
>
> err_exit:
> hdcp->seq_num_m++;
> - if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
> - DRM_DEBUG_KMS("seq_num_m roll over.\n");
> - ret = -1;
> - }
> -
> return ret;
> }
>
> @@ -1618,8 +1613,11 @@ hdcp2_propagate_stream_management_info(struct intel_connector *connector)
>
> for (i = 0; i < tries; i++) {
> ret = _hdcp2_propagate_stream_management_info(connector);
> - if (!ret)
> + if (!ret || connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
> + if (connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX)
> + drm_dbg_kms(&i915->drm, "seq_num_m roll over.\n");
> break;
> + }
Tested this with HDCP Comp tool.
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Tested-by: Anshuman Gupta <anshuman.gupta@intel.com>
>
> drm_dbg_kms(&i915->drm,
> "HDCP2 stream management %d of %d Failed.(%d)\n",
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-02-13 10:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 10:29 [PATCH v2 0/5] HDCP misc Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-12 10:29 ` [PATCH v2 1/5] drm/hdcp: optimizing the srm handling Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-18 15:43 ` Sean Paul
2020-02-18 15:43 ` Sean Paul
2020-02-12 10:29 ` [PATCH v2 2/5] drm/hdcp: fix DRM_HDCP_2_KSV_COUNT_2_LSBITS Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-13 11:37 ` Anshuman Gupta
2020-02-13 11:37 ` Anshuman Gupta
2020-02-12 10:29 ` [PATCH v2 3/5] drm/i915: terminate reauth at stream management failure Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-13 8:51 ` Anshuman Gupta
2020-02-13 8:51 ` Anshuman Gupta
2020-02-18 15:34 ` Sean Paul
2020-02-18 15:34 ` [Intel-gfx] " Sean Paul
2020-02-12 10:29 ` [PATCH v2 4/5] drm/i915: dont retry stream management at seq_num_m roll over Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-13 10:37 ` Anshuman Gupta [this message]
2020-02-13 10:37 ` Anshuman Gupta
2020-02-18 15:40 ` Sean Paul
2020-02-18 15:40 ` Sean Paul
2020-02-12 10:29 ` [PATCH v2 5/5] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
2020-02-12 10:29 ` [Intel-gfx] " Ramalingam C
2020-02-12 11:31 ` Jani Nikula
2020-02-12 11:31 ` [Intel-gfx] " Jani Nikula
2020-02-12 11:39 ` Ramalingam C
2020-02-12 11:39 ` [Intel-gfx] " Ramalingam C
2020-02-13 0:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for HDCP misc (rev2) Patchwork
2020-02-13 0:53 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-02-15 23:32 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-03-04 1:58 ` [PATCH v2 0/5] HDCP misc Ramalingam C
2020-03-04 1:58 ` [Intel-gfx] " Ramalingam C
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=20200213103746.GB11041@intel.com \
--to=anshuman.gupta@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ramalingam.c@intel.com \
/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.