Skip to content

Commit 7df06ef

Browse files
kwachowsjlawryno
authored andcommitted
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: Karol Wachowski <karol.wachowski@intel.com> Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241017145817.121590-9-jacek.lawrynowicz@linux.intel.com
1 parent 76ad741 commit 7df06ef

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/accel/ivpu/ivpu_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ extern bool ivpu_force_snoop;
197197
#define IVPU_TEST_MODE_NULL_SUBMISSION BIT(2)
198198
#define IVPU_TEST_MODE_D0I3_MSG_DISABLE BIT(4)
199199
#define IVPU_TEST_MODE_D0I3_MSG_ENABLE BIT(5)
200-
#define IVPU_TEST_MODE_PREEMPTION_DISABLE BIT(6)
200+
#define IVPU_TEST_MODE_MIP_DISABLE BIT(6)
201201
#define IVPU_TEST_MODE_DISABLE_TIMEOUTS BIT(8)
202202
#define IVPU_TEST_MODE_TURBO BIT(9)
203203
extern int ivpu_test_mode;

drivers/accel/ivpu/ivpu_job.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ static int ivpu_preemption_buffers_create(struct ivpu_device *vdev,
3535
u64 primary_size = ALIGN(vdev->fw->primary_preempt_buf_size, PAGE_SIZE);
3636
u64 secondary_size = ALIGN(vdev->fw->secondary_preempt_buf_size, PAGE_SIZE);
3737

38-
if (vdev->fw->sched_mode != VPU_SCHEDULING_MODE_HW)
38+
if (vdev->fw->sched_mode != VPU_SCHEDULING_MODE_HW ||
39+
ivpu_test_mode & IVPU_TEST_MODE_MIP_DISABLE)
3940
return 0;
4041

4142
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)
347348
if (unlikely(ivpu_test_mode & IVPU_TEST_MODE_NULL_SUBMISSION))
348349
entry->flags = VPU_JOB_FLAGS_NULL_SUBMISSION_MASK;
349350

350-
if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW &&
351-
(unlikely(!(ivpu_test_mode & IVPU_TEST_MODE_PREEMPTION_DISABLE)))) {
351+
if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW) {
352352
if (cmdq->primary_preempt_buf) {
353353
entry->primary_preempt_buf_addr = cmdq->primary_preempt_buf->vpu_addr;
354354
entry->primary_preempt_buf_size = ivpu_bo_size(cmdq->primary_preempt_buf);

0 commit comments

Comments
 (0)