Skip to content

L
linux
Commit c48abf09 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Maíra Canal
Browse files
Options

drm/v3d: Add some local variables in queries/extensions 

Add some local variables to make the code a bit less verbose, with the
main benefit being pulling some lines to under 80 columns wide.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarMaíra Canal <mcanal@igalia.com>
Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-12-tursulin@igalia.com
parent 96bc9049
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 39 deletions
drivers/gpu/drm/v3d/v3d_submit.c
View file @ c48abf09
......@@ -452,6 +452,7 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
{
u32 __user *offsets, *syncs;
struct drm_v3d_timestamp_query timestamp;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
int err;
......@@ -473,10 +474,10 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY;
job->timestamp_query.queries = kvmalloc_array(timestamp.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!job->timestamp_query.queries)
query_info->queries = kvmalloc_array(timestamp.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!query_info->queries)
return -ENOMEM;
offsets = u64_to_user_ptr(timestamp.offsets);
......@@ -490,20 +491,21 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
goto error;
}
job->timestamp_query.queries[i].offset = offset;
query_info->queries[i].offset = offset;
if (get_user(sync, syncs++)) {
err = -EFAULT;
goto error;
}
job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
if (!job->timestamp_query.queries[i].syncobj) {
query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
if (!query_info->queries[i].syncobj) {
err = -ENOENT;
goto error;
}
}
job->timestamp_query.count = timestamp.count;
query_info->count = timestamp.count;
return 0;
......@@ -519,6 +521,7 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
{
u32 __user *syncs;
struct drm_v3d_reset_timestamp_query reset;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
int err;
......@@ -537,10 +540,10 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY;
job->timestamp_query.queries = kvmalloc_array(reset.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!job->timestamp_query.queries)
query_info->queries = kvmalloc_array(reset.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!query_info->queries)
return -ENOMEM;
syncs = u64_to_user_ptr(reset.syncs);
......@@ -548,20 +551,21 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
for (i = 0; i < reset.count; i++) {
u32 sync;
job->timestamp_query.queries[i].offset = reset.offset + 8 * i;
query_info->queries[i].offset = reset.offset + 8 * i;
if (get_user(sync, syncs++)) {
err = -EFAULT;
goto error;
}
job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
if (!job->timestamp_query.queries[i].syncobj) {
query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
if (!query_info->queries[i].syncobj) {
err = -ENOENT;
goto error;
}
}
job->timestamp_query.count = reset.count;
query_info->count = reset.count;
return 0;
......@@ -578,6 +582,7 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
{
u32 __user *offsets, *syncs;
struct drm_v3d_copy_timestamp_query copy;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
int err;
......@@ -599,10 +604,10 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY;
job->timestamp_query.queries = kvmalloc_array(copy.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!job->timestamp_query.queries)
query_info->queries = kvmalloc_array(copy.count,
sizeof(struct v3d_timestamp_query),
GFP_KERNEL);
if (!query_info->queries)
return -ENOMEM;
offsets = u64_to_user_ptr(copy.offsets);
......@@ -616,20 +621,21 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
goto error;
}
job->timestamp_query.queries[i].offset = offset;
query_info->queries[i].offset = offset;
if (get_user(sync, syncs++)) {
err = -EFAULT;
goto error;
}
job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
if (!job->timestamp_query.queries[i].syncobj) {
query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
if (!query_info->queries[i].syncobj) {
err = -ENOENT;
goto error;
}
}
job->timestamp_query.count = copy.count;
query_info->count = copy.count;
job->copy.do_64bit = copy.do_64bit;
job->copy.do_partial = copy.do_partial;
......@@ -712,6 +718,7 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv,
struct drm_v3d_extension __user *ext,
struct v3d_cpu_job *job)
{
struct v3d_performance_query_info *query_info = &job->performance_query;
struct drm_v3d_reset_performance_query reset;
int err;
......@@ -730,13 +737,14 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_RESET_PERFORMANCE_QUERY;
job->performance_query.queries = kvmalloc_array(reset.count,
sizeof(struct v3d_performance_query),
GFP_KERNEL);
if (!job->performance_query.queries)
query_info->queries =
kvmalloc_array(reset.count,
sizeof(struct v3d_performance_query),
GFP_KERNEL);
if (!query_info->queries)
return -ENOMEM;
err = v3d_copy_query_info(&job->performance_query,
err = v3d_copy_query_info(query_info,
reset.count,
reset.nperfmons,
u64_to_user_ptr(reset.syncs),
......@@ -745,8 +753,8 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv,
if (err)
return err;
job->performance_query.count = reset.count;
job->performance_query.nperfmons = reset.nperfmons;
query_info->count = reset.count;
query_info->nperfmons = reset.nperfmons;
return 0;
}
......@@ -756,6 +764,7 @@ v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
struct drm_v3d_extension __user *ext,
struct v3d_cpu_job *job)
{
struct v3d_performance_query_info *query_info = &job->performance_query;
struct drm_v3d_copy_performance_query copy;
int err;
......@@ -777,13 +786,14 @@ v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY;
job->performance_query.queries = kvmalloc_array(copy.count,
sizeof(struct v3d_performance_query),
GFP_KERNEL);
if (!job->performance_query.queries)
query_info->queries =
kvmalloc_array(copy.count,
sizeof(struct v3d_performance_query),
GFP_KERNEL);
if (!query_info->queries)
return -ENOMEM;
err = v3d_copy_query_info(&job->performance_query,
err = v3d_copy_query_info(query_info,
copy.count,
copy.nperfmons,
u64_to_user_ptr(copy.syncs),
......@@ -792,9 +802,9 @@ v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
if (err)
return err;
job->performance_query.count = copy.count;
job->performance_query.nperfmons = copy.nperfmons;
job->performance_query.ncounters = copy.ncounters;
query_info->count = copy.count;
query_info->nperfmons = copy.nperfmons;
query_info->ncounters = copy.ncounters;
job->copy.do_64bit = copy.do_64bit;
job->copy.do_partial = copy.do_partial;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7