Commit b246271d authored by Wachowski, Karol's avatar Wachowski, Karol Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Deprecate DRM_IVPU_PARAM_CONTEXT_PRIORITY param 



DRM_IVPU_PARAM_CONTEXT_PRIORITY has been deprecated because it
has been replaced with DRM_IVPU_JOB_PRIORITY levels set with
submit IOCTL and was unused anyway.

Signed-off-by: default avatarWachowski, Karol <karol.wachowski@intel.com>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240115134434.493839-10-jacek.lawrynowicz@linux.intel.com
parent 37dee2a2

drivers/accel/ivpu/ivpu_drv.c

+0 −11
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_f 
	case DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:

		args->value = vdev->hw->ranges.user.start;

		break;

	case DRM_IVPU_PARAM_CONTEXT_PRIORITY:

		args->value = file_priv->priority;

		break;

	case DRM_IVPU_PARAM_CONTEXT_ID:

		args->value = file_priv->ctx.id;

		break;
@@ -219,17 +216,10 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_f 


static int ivpu_set_param_ioctl(struct drm_device *dev, void *data, struct drm_file *file)

{

	struct ivpu_file_priv *file_priv = file->driver_priv;

	struct drm_ivpu_param *args = data;

	int ret = 0;



	switch (args->param) {

	case DRM_IVPU_PARAM_CONTEXT_PRIORITY:

		if (args->value <= DRM_IVPU_CONTEXT_PRIORITY_REALTIME)

			file_priv->priority = args->value;

		else

			ret = -EINVAL;

		break;

	default:

		ret = -EINVAL;

	}
@@ -258,7 +248,6 @@ static int ivpu_open(struct drm_device *dev, struct drm_file *file) 
	}



	file_priv->vdev = vdev;

	file_priv->priority = DRM_IVPU_CONTEXT_PRIORITY_NORMAL;

	kref_init(&file_priv->ref);

	mutex_init(&file_priv->lock);

drivers/accel/ivpu/ivpu_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ struct ivpu_file_priv { 
	struct mutex lock; /* Protects cmdq */

	struct ivpu_cmdq *cmdq[IVPU_NUM_ENGINES];

	struct ivpu_mmu_context ctx;

	u32 priority;

	bool has_mmu_faults;

};

drivers/accel/ivpu/ivpu_job.c

+3 −0
Original line number Diff line number Diff line
@@ -488,6 +488,9 @@ int ivpu_submit_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	if (params->engine > DRM_IVPU_ENGINE_COPY)

		return -EINVAL;



	if (params->priority > DRM_IVPU_JOB_PRIORITY_REALTIME)

		return -EINVAL;



	if (params->buffer_count == 0 || params->buffer_count > JOB_MAX_BUFFER_COUNT)

		return -EINVAL;

include/uapi/drm/ivpu_accel.h

+20 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern "C" { 
#define DRM_IVPU_PARAM_CORE_CLOCK_RATE	    3

#define DRM_IVPU_PARAM_NUM_CONTEXTS	    4

#define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 5

#define DRM_IVPU_PARAM_CONTEXT_PRIORITY	    6

#define DRM_IVPU_PARAM_CONTEXT_PRIORITY	    6 /* Deprecated */

#define DRM_IVPU_PARAM_CONTEXT_ID	    7

#define DRM_IVPU_PARAM_FW_API_VERSION	    8

#define DRM_IVPU_PARAM_ENGINE_HEARTBEAT	    9
@@ -64,11 +64,18 @@ extern "C" { 


#define DRM_IVPU_PLATFORM_TYPE_SILICON	    0



/* Deprecated, use DRM_IVPU_JOB_PRIORITY */

#define DRM_IVPU_CONTEXT_PRIORITY_IDLE	    0

#define DRM_IVPU_CONTEXT_PRIORITY_NORMAL    1

#define DRM_IVPU_CONTEXT_PRIORITY_FOCUS	    2

#define DRM_IVPU_CONTEXT_PRIORITY_REALTIME  3



#define DRM_IVPU_JOB_PRIORITY_DEFAULT  0

#define DRM_IVPU_JOB_PRIORITY_IDLE     1

#define DRM_IVPU_JOB_PRIORITY_NORMAL   2

#define DRM_IVPU_JOB_PRIORITY_FOCUS    3

#define DRM_IVPU_JOB_PRIORITY_REALTIME 4



/**

 * DRM_IVPU_CAP_METRIC_STREAMER

 *
@@ -112,10 +119,6 @@ struct drm_ivpu_param { 
	 * %DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:

	 * Lowest VPU virtual address available in the current context (read-only)

	 *

	 * %DRM_IVPU_PARAM_CONTEXT_PRIORITY:

	 * Value of current context scheduling priority (read-write).

	 * See DRM_IVPU_CONTEXT_PRIORITY_* for possible values.

	 *

	 * %DRM_IVPU_PARAM_CONTEXT_ID:

	 * Current context ID, always greater than 0 (read-only)

	 *
@@ -286,6 +289,18 @@ struct drm_ivpu_submit { 
	 * to be executed. The offset has to be 8-byte aligned.

	 */

	__u32 commands_offset;



	/**

	 * @priority:

	 *

	 * Priority to be set for related job command queue, can be one of the following:

	 * %DRM_IVPU_JOB_PRIORITY_DEFAULT

	 * %DRM_IVPU_JOB_PRIORITY_IDLE

	 * %DRM_IVPU_JOB_PRIORITY_NORMAL

	 * %DRM_IVPU_JOB_PRIORITY_FOCUS

	 * %DRM_IVPU_JOB_PRIORITY_REALTIME

	 */

	__u32 priority;

};



/* drm_ivpu_bo_wait job status codes */