Commit 7df06efe authored by Karol Wachowski's avatar Karol Wachowski Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Don't allocate preemption buffers when MIP is disabled 



Do not allocate preemption buffers when Mid Inference Preemption (MIP)
is disabled through test mode.

Rename IVPU_TEST_MODE_PREEMPTION_DISABLE to IVPU_TEST_MODE_MIP_DISABLE
to better describe that this test mode only disables MIP - job level
preemption will still occur.

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>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241017145817.121590-9-jacek.lawrynowicz@linux.intel.com
parent 76ad741e

drivers/accel/ivpu/ivpu_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ extern bool ivpu_force_snoop; 
#define IVPU_TEST_MODE_NULL_SUBMISSION    BIT(2)

#define IVPU_TEST_MODE_D0I3_MSG_DISABLE   BIT(4)

#define IVPU_TEST_MODE_D0I3_MSG_ENABLE    BIT(5)

#define IVPU_TEST_MODE_PREEMPTION_DISABLE BIT(6)

#define IVPU_TEST_MODE_MIP_DISABLE        BIT(6)

#define IVPU_TEST_MODE_DISABLE_TIMEOUTS   BIT(8)

#define IVPU_TEST_MODE_TURBO		  BIT(9)

extern int ivpu_test_mode;

drivers/accel/ivpu/ivpu_job.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 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);



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

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

	    ivpu_test_mode & IVPU_TEST_MODE_MIP_DISABLE)

		return 0;



	cmdq->primary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &vdev->hw->ranges.user,
@@ -347,8 +348,7 @@ static int ivpu_cmdq_push_job(struct ivpu_cmdq *cmdq, struct ivpu_job *job) 
	if (unlikely(ivpu_test_mode & IVPU_TEST_MODE_NULL_SUBMISSION))

		entry->flags = VPU_JOB_FLAGS_NULL_SUBMISSION_MASK;



	if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW &&

	    (unlikely(!(ivpu_test_mode & IVPU_TEST_MODE_PREEMPTION_DISABLE)))) {

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

		if (cmdq->primary_preempt_buf) {

			entry->primary_preempt_buf_addr = cmdq->primary_preempt_buf->vpu_addr;

			entry->primary_preempt_buf_size = ivpu_bo_size(cmdq->primary_preempt_buf);