Commit 755fb867 authored by Karol Wachowski's avatar Karol Wachowski Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Use whole user and shave ranges for preemption buffers 



Do not restrict range for preemption buffers allocation just to the end
of user and shave ranges, use them whole instead to avoid situation
where end of range might be already allocated causing preemption buffers
allocation to fail.

Signed-off-by: default avatarKarol Wachowski <karol.wachowski@intel.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930195322.461209-27-jacek.lawrynowicz@linux.intel.com


Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
parent 08eb99ce

drivers/accel/ivpu/ivpu_job.c

+4 −9
Original line number Diff line number Diff line
@@ -33,24 +33,19 @@ static int ivpu_preemption_buffers_create(struct ivpu_device *vdev, 
{

	u64 primary_size = ALIGN(vdev->fw->primary_preempt_buf_size, PAGE_SIZE);

	u64 secondary_size = ALIGN(vdev->fw->secondary_preempt_buf_size, PAGE_SIZE);

	struct ivpu_addr_range range;



	if (vdev->fw->sched_mode != VPU_SCHEDULING_MODE_HW)

		return 0;



	range.start = vdev->hw->ranges.user.end - (primary_size * IVPU_NUM_CMDQS_PER_CTX);

	range.end = vdev->hw->ranges.user.end;

	cmdq->primary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &range, primary_size,

						   DRM_IVPU_BO_WC);

	cmdq->primary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &vdev->hw->ranges.user,

						   primary_size, DRM_IVPU_BO_WC);

	if (!cmdq->primary_preempt_buf) {

		ivpu_err(vdev, "Failed to create primary preemption buffer\n");

		return -ENOMEM;

	}



	range.start = vdev->hw->ranges.shave.end - (secondary_size * IVPU_NUM_CMDQS_PER_CTX);

	range.end = vdev->hw->ranges.shave.end;

	cmdq->secondary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &range, secondary_size,

						     DRM_IVPU_BO_WC);

	cmdq->secondary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &vdev->hw->ranges.shave,

						     secondary_size, DRM_IVPU_BO_WC);

	if (!cmdq->secondary_preempt_buf) {

		ivpu_err(vdev, "Failed to create secondary preemption buffer\n");

		goto err_free_primary;