[Intel-xe] [PATCH 3/5] drm/xe: Use a flags field instead of bools for sync parse

[Thomas Hellström]

On 12/4/23 11:46, Thomas Hellström wrote:
>
> On 11/16/23 20:40, Matthew Brost wrote:
>> Use a flags field instead of severval bools for sync parse as it is
>> easier to read and less bug prone.
>>
>> Suggested-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
>> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
>
> Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>
>
Hmm. It looks, though, that the header update slipped into the next patch.

/Thomas



>
>> ---
>>   drivers/gpu/drm/xe/xe_exec.c | 5 +++--
>>   drivers/gpu/drm/xe/xe_sync.c | 8 +++++---
>>   drivers/gpu/drm/xe/xe_vm.c   | 5 +++--
>>   3 files changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c
>> index 28e84a0bbeb0..7d4d22c81a42 100644
>> --- a/drivers/gpu/drm/xe/xe_exec.c
>> +++ b/drivers/gpu/drm/xe/xe_exec.c
>> @@ -181,8 +181,9 @@ int xe_exec_ioctl(struct drm_device *dev, void 
>> *data, struct drm_file *file)
>>         for (i = 0; i < args->num_syncs; i++) {
>>           err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs++],
>> -                      &syncs_user[i], true,
>> -                      xe_vm_no_dma_fences(vm));
>> +                      &syncs_user[i], SYNC_PARSE_FLAG_EXEC |
>> +                      (xe_vm_no_dma_fences(vm) ?
>> +                       SYNC_PARSE_FLAG_LR_MODE : 0));
>>           if (err)
>>               goto err_syncs;
>>       }
>> diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
>> index 73ef259aa387..016d0a2ea5bc 100644
>> --- a/drivers/gpu/drm/xe/xe_sync.c
>> +++ b/drivers/gpu/drm/xe/xe_sync.c
>> @@ -100,10 +100,12 @@ static void user_fence_cb(struct dma_fence 
>> *fence, struct dma_fence_cb *cb)
>>   int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
>>               struct xe_sync_entry *sync,
>>               struct drm_xe_sync __user *sync_user,
>> -            bool exec, bool no_dma_fences)
>> +            unsigned int flags)
>>   {
>>       struct drm_xe_sync sync_in;
>>       int err;
>> +    bool exec = flags & SYNC_PARSE_FLAG_EXEC;
>> +    bool lr_mode = flags & SYNC_PARSE_FLAG_LR_MODE;
>>       bool signal;
>>         if (copy_from_user(&sync_in, sync_user, sizeof(*sync_user)))
>> @@ -118,7 +120,7 @@ int xe_sync_entry_parse(struct xe_device *xe, 
>> struct xe_file *xef,
>>       signal = sync_in.flags & DRM_XE_SYNC_SIGNAL;
>>       switch (sync_in.flags & SYNC_FLAGS_TYPE_MASK) {
>>       case DRM_XE_SYNC_SYNCOBJ:
>> -        if (XE_IOCTL_DBG(xe, no_dma_fences && signal))
>> +        if (XE_IOCTL_DBG(xe, lr_mode && signal))
>>               return -EOPNOTSUPP;
>>             if (XE_IOCTL_DBG(xe, upper_32_bits(sync_in.addr)))
>> @@ -136,7 +138,7 @@ int xe_sync_entry_parse(struct xe_device *xe, 
>> struct xe_file *xef,
>>           break;
>>         case DRM_XE_SYNC_TIMELINE_SYNCOBJ:
>> -        if (XE_IOCTL_DBG(xe, no_dma_fences && signal))
>> +        if (XE_IOCTL_DBG(xe, lr_mode && signal))
>>               return -EOPNOTSUPP;
>>             if (XE_IOCTL_DBG(xe, upper_32_bits(sync_in.addr)))
>> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
>> index 13c8a9c6117c..1f3e5dcbef9e 100644
>> --- a/drivers/gpu/drm/xe/xe_vm.c
>> +++ b/drivers/gpu/drm/xe/xe_vm.c
>> @@ -3089,8 +3089,9 @@ int xe_vm_bind_ioctl(struct drm_device *dev, 
>> void *data, struct drm_file *file)
>>       syncs_user = u64_to_user_ptr(args->syncs);
>>       for (num_syncs = 0; num_syncs < args->num_syncs; num_syncs++) {
>>           err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs],
>> -                      &syncs_user[num_syncs], false,
>> -                      xe_vm_no_dma_fences(vm));
>> +                      &syncs_user[num_syncs],
>> +                      xe_vm_no_dma_fences(vm) ?
>> +                      SYNC_PARSE_FLAG_LR_MODE : 0);
>>           if (err)
>>               goto free_syncs;
>>       }