Commit 53bf60f6 authored by Matthew Brost's avatar Matthew Brost Committed by Rodrigo Vivi

drm/xe: Use a flags field instead of bools for sync parse

Use a flags field instead of severval bools for sync parse as it is
easier to read and less bug prone.

v2: Pull in header change from subsequent patch
Suggested-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 3b97e3b2
...@@ -151,8 +151,9 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) ...@@ -151,8 +151,9 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
for (i = 0; i < args->num_syncs; i++) { for (i = 0; i < args->num_syncs; i++) {
err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs++], err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs++],
&syncs_user[i], true, &syncs_user[i], SYNC_PARSE_FLAG_EXEC |
xe_vm_in_lr_mode(vm)); (xe_vm_in_lr_mode(vm) ?
SYNC_PARSE_FLAG_LR_MODE : 0));
if (err) if (err)
goto err_syncs; goto err_syncs;
} }
......
...@@ -98,10 +98,12 @@ static void user_fence_cb(struct dma_fence *fence, struct dma_fence_cb *cb) ...@@ -98,10 +98,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, int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
struct xe_sync_entry *sync, struct xe_sync_entry *sync,
struct drm_xe_sync __user *sync_user, struct drm_xe_sync __user *sync_user,
bool exec, bool in_lr_mode) unsigned int flags)
{ {
struct drm_xe_sync sync_in; struct drm_xe_sync sync_in;
int err; int err;
bool exec = flags & SYNC_PARSE_FLAG_EXEC;
bool in_lr_mode = flags & SYNC_PARSE_FLAG_LR_MODE;
bool signal; bool signal;
if (copy_from_user(&sync_in, sync_user, sizeof(*sync_user))) if (copy_from_user(&sync_in, sync_user, sizeof(*sync_user)))
......
...@@ -12,10 +12,13 @@ struct xe_device; ...@@ -12,10 +12,13 @@ struct xe_device;
struct xe_file; struct xe_file;
struct xe_sched_job; struct xe_sched_job;
#define SYNC_PARSE_FLAG_EXEC BIT(0)
#define SYNC_PARSE_FLAG_LR_MODE BIT(1)
int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef,
struct xe_sync_entry *sync, struct xe_sync_entry *sync,
struct drm_xe_sync __user *sync_user, struct drm_xe_sync __user *sync_user,
bool exec, bool compute_mode); unsigned int flags);
int xe_sync_entry_wait(struct xe_sync_entry *sync); int xe_sync_entry_wait(struct xe_sync_entry *sync);
int xe_sync_entry_add_deps(struct xe_sync_entry *sync, int xe_sync_entry_add_deps(struct xe_sync_entry *sync,
struct xe_sched_job *job); struct xe_sched_job *job);
......
...@@ -2994,8 +2994,9 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) ...@@ -2994,8 +2994,9 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
syncs_user = u64_to_user_ptr(args->syncs); syncs_user = u64_to_user_ptr(args->syncs);
for (num_syncs = 0; num_syncs < args->num_syncs; num_syncs++) { for (num_syncs = 0; num_syncs < args->num_syncs; num_syncs++) {
err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs], err = xe_sync_entry_parse(xe, xef, &syncs[num_syncs],
&syncs_user[num_syncs], false, &syncs_user[num_syncs],
xe_vm_in_lr_mode(vm)); xe_vm_in_lr_mode(vm) ?
SYNC_PARSE_FLAG_LR_MODE : 0);
if (err) if (err)
goto free_syncs; goto free_syncs;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment