[Intel-gfx] [PATCH v5 12/40] drm/i915: Enable HDCP1.4 incase of HDCP2.2 failure

[Ramalingam C]

On Tuesday 10 July 2018 02:14 AM, Sean Paul wrote:
> On Wed, Jun 27, 2018 at 02:10:01PM +0530, Ramalingam C wrote:
>> When HDCP2.2 enabling fails and HDCP1.4 is supported, HDCP1.4 is
>> enabled.
>>
> Just squash this into patch 11, no need for a separate patch.
Doing it in the next version of the series.

Ram.
>
>> v2:
>>    Rebased.
>> v3:
>>    No Changes.
>> v4:
>>    Reviewed-by is collected.
>> v5:
>>    No Change.
>>
>> Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
>> Reviewed-by: Uma Shankar <uma.shankar at intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_hdcp.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
>> index b34e3b1587d6..34bafc2025f7 100644
>> --- a/drivers/gpu/drm/i915/intel_hdcp.c
>> +++ b/drivers/gpu/drm/i915/intel_hdcp.c
>> @@ -863,7 +863,9 @@ int intel_hdcp_enable(struct intel_connector *connector)
>>   	 */
>>   	if (intel_hdcp2_capable(connector))
>>   		ret = _intel_hdcp2_enable(connector);
>> -	else if (intel_hdcp_capable(connector))
>> +
>> +	/* When HDCP2.2 fails, HDCP1.4 will be attempted */
>> +	if (ret && intel_hdcp_capable(connector))
>>   		ret = _intel_hdcp_enable(connector);
>>   
>>   	if (!ret) {
>> -- 
>> 2.7.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx