[Intel-gfx] [PATCH v2] drm/i915: HDCP: fix Ri prime check done during link check

[Jani Nikula]

On Sun, 29 Mar 2020, Ramalingam C <ramalingam.c at intel.com> wrote:
> On 2020-03-28 at 11:41:00 +0100, Oliver Barta wrote:
>> From: Oliver Barta <oliver.barta at 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 at 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 at 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