Commit adfef713 authored by Jacek Lawrynowicz's avatar Jacek Lawrynowicz
Browse files

accel/ivpu: Fix ivpu_reset_engine_fn merge issue 



ivpu_reset_engine_fn and ivpu_reset_engine_fops were separated during
merge so move them back together to keep the file consistent.

Signed-off-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/20240214081305.290108-7-jacek.lawrynowicz@linux.intel.com
parent f32d5967

drivers/accel/ivpu/ivpu_debugfs.c

+16 −16
Original line number Diff line number Diff line
@@ -286,22 +286,6 @@ static const struct file_operations fw_trace_level_fops = { 
	.write = fw_trace_level_fops_write,

};



static ssize_t

ivpu_reset_engine_fn(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)

{

	struct ivpu_device *vdev = file->private_data;



	if (!size)

		return -EINVAL;



	if (ivpu_jsm_reset_engine(vdev, DRM_IVPU_ENGINE_COMPUTE))

		return -ENODEV;

	if (ivpu_jsm_reset_engine(vdev, DRM_IVPU_ENGINE_COPY))

		return -ENODEV;



	return size;

}



static ssize_t

ivpu_force_recovery_fn(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)

{
@@ -327,6 +311,22 @@ static const struct file_operations ivpu_force_recovery_fops = { 
	.write = ivpu_force_recovery_fn,

};



static ssize_t

ivpu_reset_engine_fn(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)

{

	struct ivpu_device *vdev = file->private_data;



	if (!size)

		return -EINVAL;



	if (ivpu_jsm_reset_engine(vdev, DRM_IVPU_ENGINE_COMPUTE))

		return -ENODEV;

	if (ivpu_jsm_reset_engine(vdev, DRM_IVPU_ENGINE_COPY))

		return -ENODEV;



	return size;

}



static const struct file_operations ivpu_reset_engine_fops = {

	.owner = THIS_MODULE,

	.open = simple_open,