From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ramalingam C <ramalingam.c@intel.com>,
Oliver Barta <o.barta89@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org,
Ravisankar Madasamy <ravisankar.madasamy@intel.com>,
Sean Paul <seanpaul@chromium.org>,
Oliver Barta <oliver.barta@aptiv.com>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime check done during link check
Date: Thu, 16 Apr 2020 12:53:38 +0300 [thread overview]
Message-ID: <87ftd34uzh.fsf@intel.com> (raw)
In-Reply-To: <20200329141738.GA20693@intel.com>
On Sun, 29 Mar 2020, Ramalingam C <ramalingam.c@intel.com> wrote:
> On 2020-03-28 at 11:41:00 +0100, Oliver Barta wrote:
>> From: Oliver Barta <oliver.barta@aptiv.com>
>>
>> The check was always succeeding even in case of a mismatch due to the
>> HDCP_STATUS_ENC bit being set. Make sure both bits are actually set.
>>
> Looks good to me:
>
> Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Pushed to dinq, thanks for the patch and review.
Fixed the checkpatch indentation warning while at it.
BR,
Jani.
>> Signed-off-by: Oliver Barta <oliver.barta@aptiv.com>
>> Fixes: 2320175feb74 ("drm/i915: Implement HDCP for HDMI")
>> ---
>> [v2] rebased on top of latest changes
>>
>> drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> index 0076abc63851..51a69f330588 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> @@ -1561,7 +1561,8 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
>> intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
>>
>> /* Wait for Ri prime match */
>> - if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
>> + if (wait_for((intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder,
>> + port)) & (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC)) ==
>> (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
>> drm_err(&i915->drm,
>> "Ri' mismatch detected, link check failed (%x)\n",
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-04-16 9:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-28 10:41 [Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime check done during link check Oliver Barta
2020-03-29 14:17 ` Ramalingam C
2020-04-16 9:53 ` Jani Nikula [this message]
2020-03-30 16:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HDCP: fix Ri prime check done during link check (rev2) Patchwork
2020-03-30 17:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-03-31 5:15 ` [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=87ftd34uzh.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=o.barta89@gmail.com \
--cc=oliver.barta@aptiv.com \
--cc=ramalingam.c@intel.com \
--cc=ravisankar.madasamy@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox