Re: [PATCH] drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal

[Nirmoy Das <nirmoy.das@linux.intel.com>]

On 7/9/2024 9:12 PM, Rodrigo Vivi wrote:
> On Mon, Jul 08, 2024 at 02:59:18PM +0200, Nirmoy Das wrote:
>> Free arbiter allocated in intel_hdcp_gsc_init().
>>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Thanks! Merged to  drm-xe-next


>
>> Fixes: 152f2df954d8 ("drm/xe/hdcp: Enable HDCP for XE")
>> Cc: Suraj Kandpal <suraj.kandpal@intel.com>
>> Cc: Arun R Murthy <arun.r.murthy@intel.com>
>> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> ---
>>   drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 ++++++++----
>>   1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> index 14b8b4278317..990285aa9b26 100644
>> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
>> @@ -160,12 +160,16 @@ void intel_hdcp_gsc_fini(struct xe_device *xe)
>>   {
>>   	struct intel_hdcp_gsc_message *hdcp_message =
>>   					xe->display.hdcp.hdcp_message;
>> +	struct i915_hdcp_arbiter *arb = xe->display.hdcp.arbiter;
>>   
>> -	if (!hdcp_message)
>> -		return;
>> +	if (hdcp_message) {
>> +		xe_bo_unpin_map_no_vm(hdcp_message->hdcp_bo);
>> +		kfree(hdcp_message);
>> +		xe->display.hdcp.hdcp_message = NULL;
>> +	}
>>   
>> -	xe_bo_unpin_map_no_vm(hdcp_message->hdcp_bo);
>> -	kfree(hdcp_message);
>> +	kfree(arb);
>> +	xe->display.hdcp.arbiter = NULL;
>>   }
>>   
>>   static int xe_gsc_send_sync(struct xe_device *xe,
>> -- 
>> 2.42.0
>>