Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Karol Wachowski and committed by
Jacek Lawrynowicz
7df06efe 76ad741e

+4 -4
+1 -1
drivers/accel/ivpu/ivpu_drv.h
··· 197 197 #define IVPU_TEST_MODE_NULL_SUBMISSION BIT(2) 198 198 #define IVPU_TEST_MODE_D0I3_MSG_DISABLE BIT(4) 199 199 #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) 201 201 #define IVPU_TEST_MODE_DISABLE_TIMEOUTS BIT(8) 202 202 #define IVPU_TEST_MODE_TURBO BIT(9) 203 203 extern int ivpu_test_mode;
+3 -3
drivers/accel/ivpu/ivpu_job.c
··· 35 35 u64 primary_size = ALIGN(vdev->fw->primary_preempt_buf_size, PAGE_SIZE); 36 36 u64 secondary_size = ALIGN(vdev->fw->secondary_preempt_buf_size, PAGE_SIZE); 37 37 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) 39 40 return 0; 40 41 41 42 cmdq->primary_preempt_buf = ivpu_bo_create(vdev, &file_priv->ctx, &vdev->hw->ranges.user, ··· 348 347 if (unlikely(ivpu_test_mode & IVPU_TEST_MODE_NULL_SUBMISSION)) 349 348 entry->flags = VPU_JOB_FLAGS_NULL_SUBMISSION_MASK; 350 349 351 - if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW && 352 - (unlikely(!(ivpu_test_mode & IVPU_TEST_MODE_PREEMPTION_DISABLE)))) { 350 + if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW) { 353 351 if (cmdq->primary_preempt_buf) { 354 352 entry->primary_preempt_buf_addr = cmdq->primary_preempt_buf->vpu_addr; 355 353 entry->primary_preempt_buf_size = ivpu_bo_size(cmdq->primary_preempt_buf);