[PATCH 6/7] drm/v3d: switch to using drm_exec
Maira Canal
mcanal at igalia.com
Mon Jul 17 19:32:42 UTC 2023
Hi Christian,
I believe that `select DRM_EXEC` is missing on v3d's Kconfig file. If
we don't select it, we will get some compilation errors.
Apart from this problem, I ran some tests on the RPi 4 and didn't see
any problems.
Best Regards,
- Maíra
On 7/12/23 09:47, Christian König wrote:
> Just a straightforward conversion without any optimization.
>
> Only compile tested for now.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> Cc: Emma Anholt <emma at anholt.net>
> Cc: Melissa Wen <mwen at igalia.com>
> ---
> drivers/gpu/drm/v3d/v3d_gem.c | 44 ++++++++++++++++-------------------
> 1 file changed, 20 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
> index 2e94ce788c71..190e2a9f64a4 100644
> --- a/drivers/gpu/drm/v3d/v3d_gem.c
> +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> @@ -10,6 +10,7 @@
> #include <linux/sched/signal.h>
> #include <linux/uaccess.h>
>
> +#include <drm/drm_exec.h>
> #include <drm/drm_managed.h>
> #include <drm/drm_syncobj.h>
> #include <uapi/drm/v3d_drm.h>
> @@ -249,20 +250,17 @@ v3d_invalidate_caches(struct v3d_dev *v3d)
> * to v3d, so we don't attach dma-buf fences to them.
> */
> static int
> -v3d_lock_bo_reservations(struct v3d_job *job,
> - struct ww_acquire_ctx *acquire_ctx)
> +v3d_lock_bo_reservations(struct v3d_job *job, struct drm_exec *exec)
> {
> int i, ret;
>
> - ret = drm_gem_lock_reservations(job->bo, job->bo_count, acquire_ctx);
> + drm_exec_init(exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
> + drm_exec_until_all_locked(exec)
> + ret = drm_exec_prepare_array(exec, job->bo, job->bo_count, 1);
> if (ret)
> - return ret;
> + goto fail;
>
> for (i = 0; i < job->bo_count; i++) {
> - ret = dma_resv_reserve_fences(job->bo[i]->resv, 1);
> - if (ret)
> - goto fail;
> -
> ret = drm_sched_job_add_implicit_dependencies(&job->base,
> job->bo[i], true);
> if (ret)
> @@ -272,7 +270,7 @@ v3d_lock_bo_reservations(struct v3d_job *job,
> return 0;
>
> fail:
> - drm_gem_unlock_reservations(job->bo, job->bo_count, acquire_ctx);
> + drm_exec_fini(exec);
> return ret;
> }
>
> @@ -477,7 +475,7 @@ v3d_push_job(struct v3d_job *job)
> static void
> v3d_attach_fences_and_unlock_reservation(struct drm_file *file_priv,
> struct v3d_job *job,
> - struct ww_acquire_ctx *acquire_ctx,
> + struct drm_exec *exec,
> u32 out_sync,
> struct v3d_submit_ext *se,
> struct dma_fence *done_fence)
> @@ -492,7 +490,7 @@ v3d_attach_fences_and_unlock_reservation(struct drm_file *file_priv,
> DMA_RESV_USAGE_WRITE);
> }
>
> - drm_gem_unlock_reservations(job->bo, job->bo_count, acquire_ctx);
> + drm_exec_fini(exec);
>
> /* Update the return sync object for the job */
> /* If it only supports a single signal semaphore*/
> @@ -669,7 +667,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
> struct v3d_render_job *render = NULL;
> struct v3d_job *clean_job = NULL;
> struct v3d_job *last_job;
> - struct ww_acquire_ctx acquire_ctx;
> + struct drm_exec exec;
> int ret = 0;
>
> trace_v3d_submit_cl_ioctl(&v3d->drm, args->rcl_start, args->rcl_end);
> @@ -731,7 +729,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
> if (ret)
> goto fail;
>
> - ret = v3d_lock_bo_reservations(last_job, &acquire_ctx);
> + ret = v3d_lock_bo_reservations(last_job, &exec);
> if (ret)
> goto fail;
>
> @@ -775,7 +773,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
>
> v3d_attach_fences_and_unlock_reservation(file_priv,
> last_job,
> - &acquire_ctx,
> + &exec,
> args->out_sync,
> &se,
> last_job->done_fence);
> @@ -791,8 +789,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
> fail_unreserve:
> mutex_unlock(&v3d->sched_lock);
> fail_perfmon:
> - drm_gem_unlock_reservations(last_job->bo,
> - last_job->bo_count, &acquire_ctx);
> + drm_exec_fini(&exec);
> fail:
> v3d_job_cleanup((void *)bin);
> v3d_job_cleanup((void *)render);
> @@ -819,7 +816,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
> struct drm_v3d_submit_tfu *args = data;
> struct v3d_submit_ext se = {0};
> struct v3d_tfu_job *job = NULL;
> - struct ww_acquire_ctx acquire_ctx;
> + struct drm_exec exec;
> int ret = 0;
>
> trace_v3d_submit_tfu_ioctl(&v3d->drm, args->iia);
> @@ -870,7 +867,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
> job->base.bo[job->base.bo_count] = bo;
> }
>
> - ret = v3d_lock_bo_reservations(&job->base, &acquire_ctx);
> + ret = v3d_lock_bo_reservations(&job->base, &exec);
> if (ret)
> goto fail;
>
> @@ -879,7 +876,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
> mutex_unlock(&v3d->sched_lock);
>
> v3d_attach_fences_and_unlock_reservation(file_priv,
> - &job->base, &acquire_ctx,
> + &job->base, &exec,
> args->out_sync,
> &se,
> job->base.done_fence);
> @@ -914,7 +911,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
> struct v3d_submit_ext se = {0};
> struct v3d_csd_job *job = NULL;
> struct v3d_job *clean_job = NULL;
> - struct ww_acquire_ctx acquire_ctx;
> + struct drm_exec exec;
> int ret;
>
> trace_v3d_submit_csd_ioctl(&v3d->drm, args->cfg[5], args->cfg[6]);
> @@ -957,7 +954,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
> if (ret)
> goto fail;
>
> - ret = v3d_lock_bo_reservations(clean_job, &acquire_ctx);
> + ret = v3d_lock_bo_reservations(clean_job, &exec);
> if (ret)
> goto fail;
>
> @@ -983,7 +980,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
>
> v3d_attach_fences_and_unlock_reservation(file_priv,
> clean_job,
> - &acquire_ctx,
> + &exec,
> args->out_sync,
> &se,
> clean_job->done_fence);
> @@ -996,8 +993,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
> fail_unreserve:
> mutex_unlock(&v3d->sched_lock);
> fail_perfmon:
> - drm_gem_unlock_reservations(clean_job->bo, clean_job->bo_count,
> - &acquire_ctx);
> + drm_exec_fini(&exec);
> fail:
> v3d_job_cleanup((void *)job);
> v3d_job_cleanup(clean_job);
More information about the dri-devel
mailing list