git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-25 00:52:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/v3d: Create a CPU job extension for the reset timestamp job

Browse Source 
A CPU job is a type of job that performs operations that requires CPU
intervention. A reset timestamp job is a job that resets the timestamp
queries based on the value offset of the first query. As V3D doesn't
provide any mechanism to obtain a timestamp from the GPU, it is a job
that needs CPU intervention.

So, create a user extension for the CPU job that enables the creation
of a reset timestamp job. This user extension will allow the creation of
a CPU job that resets the timestamp value in the timestamp BO and resets
the availability syncobj.

Signed-off-by: Maíra Canal <mcanal@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231130164420.932823-16-mcanal@igalia.com
This commit is contained in:
Maíra Canal
2023-11-30 13:40:37 -03:00
parent 9ba0ff3e08
commit 34a101e642
4 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/v3d/v3d_drv.h
View File

@@ -319,6 +319,7 @@ struct v3d_csd_job {
enum v3d_cpu_job_type {
V3D_CPU_JOB_TYPE_INDIRECT_CSD = 1,
V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY,
V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY,
};
struct v3d_timestamp_query {

21
drivers/gpu/drm/v3d/v3d_sched.c
View File

@@ -342,9 +342,30 @@ v3d_timestamp_query(struct v3d_cpu_job *job)
v3d_put_bo_vaddr(bo);
}
static void
v3d_reset_timestamp_queries(struct v3d_cpu_job *job)
{
struct v3d_timestamp_query_info *timestamp_query = &job->timestamp_query;
struct v3d_timestamp_query *queries = timestamp_query->queries;
struct v3d_bo *bo = to_v3d_bo(job->base.bo[0]);
u8 *value_addr;
v3d_get_bo_vaddr(bo);
for (int i = 0; i < timestamp_query->count; i++) {
value_addr = ((u8 *)bo->vaddr) + queries[i].offset;
*((u64 *)value_addr) = 0;
drm_syncobj_replace_fence(queries[i].syncobj, NULL);
}
v3d_put_bo_vaddr(bo);
}
static const v3d_cpu_job_fn cpu_job_function[] = {
[V3D_CPU_JOB_TYPE_INDIRECT_CSD] = v3d_rewrite_csd_job_wg_counts_from_indirect,
[V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY] = v3d_timestamp_query,
[V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY] = v3d_reset_timestamp_queries,
};
static struct dma_fence *

52
drivers/gpu/drm/v3d/v3d_submit.c
View File

@@ -491,6 +491,54 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
return 0;
}
static int
v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
struct drm_v3d_extension __user *ext,
struct v3d_cpu_job *job)
{
u32 __user *syncs;
struct drm_v3d_reset_timestamp_query reset;
if (!job) {
DRM_DEBUG("CPU job extension was attached to a GPU job.\n");
return -EINVAL;
}
if (job->job_type) {
DRM_DEBUG("Two CPU job extensions were added to the same CPU job.\n");
return -EINVAL;
}
if (copy_from_user(&reset, ext, sizeof(reset)))
return -EFAULT;
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)
return -ENOMEM;
syncs = u64_to_user_ptr(reset.syncs);
for (int i = 0; i < reset.count; i++) {
u32 sync;
job->timestamp_query.queries[i].offset = reset.offset + 8 * i;
if (copy_from_user(&sync, syncs++, sizeof(sync))) {
kvfree(job->timestamp_query.queries);
return -EFAULT;
}
job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
}
job->timestamp_query.count = reset.count;
return 0;
}
/* Whenever userspace sets ioctl extensions, v3d_get_extensions parses data
* according to the extension id (name).
*/
@@ -522,6 +570,9 @@ v3d_get_extensions(struct drm_file *file_priv,
case DRM_V3D_EXT_ID_CPU_TIMESTAMP_QUERY:
ret = v3d_get_cpu_timestamp_query_params(file_priv, user_ext, job);
break;
case DRM_V3D_EXT_ID_CPU_RESET_TIMESTAMP_QUERY:
ret = v3d_get_cpu_reset_timestamp_params(file_priv, user_ext, job);
break;
default:
DRM_DEBUG_DRIVER("Unknown extension id: %d\n", ext.id);
return -EINVAL;
@@ -899,6 +950,7 @@ fail:
static const unsigned int cpu_job_bo_handle_count[] = {
[V3D_CPU_JOB_TYPE_INDIRECT_CSD] = 1,
[V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY] = 1,
[V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY] = 1,
};
/**