Commit 41136025 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

accel/ivpu: Reserve all non-command bo's using DMA_RESV_USAGE_BOOKKEEP 



Use DMA_RESV_USAGE_BOOKKEEP reservation for buffer objects, except for
command buffers for which we use DMA_RESV_USAGE_WRITE (since VPU can
write to command buffer context save area).

Fixes: 0ec86718 ("accel/ivpu: Fix S3 system suspend when not idle")
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230413063810.3167511-1-stanislaw.gruszka@linux.intel.com
parent 50d30040

drivers/accel/ivpu/ivpu_job.c

+14 −7
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ ivpu_job_prepare_bos_for_submit(struct drm_file *file, struct ivpu_job *job, u32 
	struct ivpu_file_priv *file_priv = file->driver_priv;

	struct ivpu_device *vdev = file_priv->vdev;

	struct ww_acquire_ctx acquire_ctx;

	enum dma_resv_usage usage;

	struct ivpu_bo *bo;

	int ret;

	u32 i;
@@ -461,22 +462,28 @@ ivpu_job_prepare_bos_for_submit(struct drm_file *file, struct ivpu_job *job, u32 


	job->cmd_buf_vpu_addr = bo->vpu_addr + commands_offset;



	ret = drm_gem_lock_reservations((struct drm_gem_object **)job->bos, 1, &acquire_ctx);

	ret = drm_gem_lock_reservations((struct drm_gem_object **)job->bos, buf_count,

					&acquire_ctx);

	if (ret) {

		ivpu_warn(vdev, "Failed to lock reservations: %d\n", ret);

		return ret;

	}



	ret = dma_resv_reserve_fences(bo->base.resv, 1);

	for (i = 0; i < buf_count; i++) {

		ret = dma_resv_reserve_fences(job->bos[i]->base.resv, 1);

		if (ret) {

			ivpu_warn(vdev, "Failed to reserve fences: %d\n", ret);

			goto unlock_reservations;

		}

	}



	dma_resv_add_fence(bo->base.resv, job->done_fence, DMA_RESV_USAGE_WRITE);

	for (i = 0; i < buf_count; i++) {

		usage = (i == CMD_BUF_IDX) ? DMA_RESV_USAGE_WRITE : DMA_RESV_USAGE_BOOKKEEP;

		dma_resv_add_fence(job->bos[i]->base.resv, job->done_fence, usage);

	}



unlock_reservations:

	drm_gem_unlock_reservations((struct drm_gem_object **)job->bos, 1, &acquire_ctx);

	drm_gem_unlock_reservations((struct drm_gem_object **)job->bos, buf_count, &acquire_ctx);



	wmb(); /* Flush write combining buffers */