[PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibilty

[Nilawar, Badal]

On 22-10-2024 13:14, Jani Nikula wrote:
> On Tue, 22 Oct 2024, "Nilawar, Badal" <badal.nilawar at intel.com> wrote:
>> -----Original Message-----
>> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of Suraj Kandpal
>> Sent: 22 October 2024 11:27
>> To: intel-xe at lists.freedesktop.org; intel-gfx at lists.freedesktop.org
>> Cc: Kandpal, Suraj <suraj.kandpal at intel.com>
>> Subject: [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibilty
>>
>> Add check to remove HDCP2 compatibility from BMG as it does not have GSC which ends up causing warning when we try to get reference of GSC FW.
>>
>> Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
>>
>> Could you please add fixes tag in commit message.
>>
>> Fixes: 89d030804831 ("drm/xe/hdcp: Fix condition for hdcp gsc cs requirement")
>> Fixes: 883631771038 ("drm/i915/mtl: Add HDCP GSC interface")
>>
>> Regards,
>> Badal
> 
> Please quote your replies properly [1]. Your mail is really quite hard
> to read [2].

I responded via Outlook because this email wasn't visible in 
Thunderbird. I hope my comments are understood.

Thanks,
Badal

> 
> BR,
> Jani.
> 
> [1] https://subspace.kernel.org/etiquette.html#do-not-top-post-when-replying
> 
> [2] https://lore.kernel.org/all/BN9PR11MB5530247EFE733E0B4E16870AE54C2@BN9PR11MB5530.namprd11.prod.outlook.com/
> 
>> ---
>>   drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 3 ++-
>>   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c      | 3 ++-
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> index 55965844d829..2c1d0ee8cec2 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
>> @@ -21,7 +21,8 @@ struct intel_hdcp_gsc_message {
>>   
>>   bool intel_hdcp_gsc_cs_required(struct intel_display *display)  {
>> -	return DISPLAY_VER(display) >= 14;
>> +	return DISPLAY_VER(display) >= 14 &&
>> +		DISPLAY_VER_FULL(display) != IP_VER(14, 1);
>>   }
>>   
>>   bool intel_hdcp_gsc_check_status(struct intel_display *display) diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> index 231677129a35..e3c57f0b79c4 100644
>> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> @@ -32,7 +32,8 @@ struct intel_hdcp_gsc_message {
>>   
>>   bool intel_hdcp_gsc_cs_required(struct intel_display *display)  {
>> -	return DISPLAY_VER(display) >= 14;
>> +	return DISPLAY_VER(display) >= 14 &&
>> +		DISPLAY_VER_FULL(display) != IP_VER(14, 1);
>>   }
>>   
>>   bool intel_hdcp_gsc_check_status(struct intel_display *display)
>> --
>> 2.34.1
>>
>