Re: [PATCH] drm/xe: remove unmatched xe_vm_unlock() from __xe_exec_queue_init()

[Maciej Patelczyk <maciej.patelczyk@intel.com>]

On 30.05.2025 16:07, Cavitt, Jonathan wrote:
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Maciej Patelczyk
> Sent: Friday, May 30, 2025 1:49 AM
> To: intel-xe@lists.freedesktop.org
> Cc: Vishwanathapura, Niranjana <niranjana.vishwanathapura@intel.com>; Brost, Matthew <matthew.brost@intel.com>; maarten.lankhorst@linux.intel.com; Patelczyk, Maciej <maciej.patelczyk@intel.com>
> Subject: [PATCH] drm/xe: remove unmatched xe_vm_unlock() from __xe_exec_queue_init()
>> There is unmatched xe_vm_unlock() in the __xe_exec_queue_init().
>> Leftover from fbeaad071a98 ("drm/xe: Create LRC BO without VM")
> Good catch!
> There's a checkpatch warning asking for this commit message to be
> updated to something like:
> """
> There is an unmatched xe_vm_unlock() in the __xe_exec_queue_init()
> function, leftover from
> commit fbeaad071a98 ("drm/xe: Create LRC BO without VM").
> Remove it.
> """
> But besides the checkpatch issue:
> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
> -Jonathan Cavitt

Thanks!

Maciej

>> Fixes: fbeaad071a98 ("drm/xe: Create LRC BO without VM")
>> Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
>> ---
>>   drivers/gpu/drm/xe/xe_exec_queue.c | 6 +-----
>>   1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
>> index 32c6923df7c3..fee22358cc09 100644
>> --- a/drivers/gpu/drm/xe/xe_exec_queue.c
>> +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
>> @@ -114,7 +114,6 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(struct xe_device *xe,
>>   
>>   static int __xe_exec_queue_init(struct xe_exec_queue *q)
>>   {
>> -	struct xe_vm *vm = q->vm;
>>   	int i, err;
>>   	u32 flags = 0;
>>   
>> @@ -136,7 +135,7 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q)
>>   		q->lrc[i] = xe_lrc_create(q->hwe, q->vm, SZ_16K, q->msix_vec, flags);
>>   		if (IS_ERR(q->lrc[i])) {
>>   			err = PTR_ERR(q->lrc[i]);
>> -			goto err_unlock;
>> +			goto err_lrc;
>>   		}
>>   	}
>>   
>> @@ -146,9 +145,6 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q)
>>   
>>   	return 0;
>>   
>> -err_unlock:
>> -	if (vm)
>> -		xe_vm_unlock(vm);
>>   err_lrc:
>>   	for (i = i - 1; i >= 0; --i)
>>   		xe_lrc_put(q->lrc[i]);
>> -- 
>> 2.35.0
>>
>>