From nobody Fri Sep 20 12:36:18 2024 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCD7C12BE94; Tue, 6 Feb 2024 08:02:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206558; cv=none; b=tj8lPwz5FYFy/2ANYOTkmGDH+Jzq2BDUqgD7p2mb7jCciCrV/uBvvWWVth4pYImJV2Wn5R5GgfpXNTvEx0Vk0xcyu1vspyOCtgrW76HxJbyr4/ZTxH6RaYl+3Q11X/nCM38K5ZrKVbnmyj446/DTTTjQf2JwdptsxME89XGjzK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206558; c=relaxed/simple; bh=g77D8zO1tvvK6jlsUohRwg17Stiy+Yb2awskG4k7f58=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OFuBu4GJfDJhVwbe/fBpSAqq9keAJl9ktSFALUJ3I9sdm08+HcPJibOjRvVpVKlt08bSRP3X4HzYAXsOoObxFQw3RPkmCOmWkyfa2wDZob6ZcrD6tHP8xTPFjBLhJJNEWwFKZMsjUuKba7CbfXLzvcXFtopafUwSa9frdDPjrWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=aTgTCdut; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="aTgTCdut" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1707206550; bh=g77D8zO1tvvK6jlsUohRwg17Stiy+Yb2awskG4k7f58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aTgTCdutmtIfv1sIs+ebKRAamXn2cWiWoUVSKjmxhXdyrkxuDuov+uv6IFsC0jfpS I8Spgb9sprEFGVtrKQlwy5ho0L008QV1VadVSXpKCWfCJ0fErT/0P6o/2cIHEAbape myYFnM4G119aM4Ks0/PJ3gJKz4XUgt0HbUqhAzulfYaVV/3XgkS6GyXOuRDhHBTsyQ CTXPIBNtcP/BZA6gtUvXbXOeDR7xTlvod3m+XFoC/CwAjKxS0nc+V6syYJBFQA6EWI 9REBoRkUZe/r1nD9Hmq2foUfU3DiNCH4l2yiEEi3fskzm6Fhg8NaN7kI6wTkti0nym wuGf7yB3e/Rzg== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madrid.collaboradmins.com (Postfix) with ESMTPSA id A55093782085; Tue, 6 Feb 2024 08:02:29 +0000 (UTC) From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v19 8/9] media: v4l2: Add mem2mem helpers for DELETE_BUFS ioctl Date: Tue, 6 Feb 2024 09:02:18 +0100 Message-Id: <20240206080219.11951-9-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240206080219.11951-1-benjamin.gaignard@collabora.com> References: <20240206080219.11951-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create v4l2-mem2mem helpers for VIDIOC_DELETE_BUFS ioctl and make test drivers use it. Signed-off-by: Benjamin Gaignard --- drivers/media/test-drivers/vicodec/vicodec-core.c | 1 + drivers/media/test-drivers/vim2m.c | 1 + drivers/media/test-drivers/vimc/vimc-capture.c | 1 + drivers/media/test-drivers/visl/visl-video.c | 1 + drivers/media/test-drivers/vivid/vivid-core.c | 1 + drivers/media/v4l2-core/v4l2-mem2mem.c | 10 ++++++++++ include/media/v4l2-mem2mem.h | 2 ++ 7 files changed, 17 insertions(+) diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/me= dia/test-drivers/vicodec/vicodec-core.c index e13f5452b927..5a2d34ac12c2 100644 --- a/drivers/media/test-drivers/vicodec/vicodec-core.c +++ b/drivers/media/test-drivers/vicodec/vicodec-core.c @@ -1345,6 +1345,7 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = =3D { .vidioc_prepare_buf =3D v4l2_m2m_ioctl_prepare_buf, .vidioc_create_bufs =3D v4l2_m2m_ioctl_create_bufs, .vidioc_expbuf =3D v4l2_m2m_ioctl_expbuf, + .vidioc_delete_bufs =3D v4l2_m2m_ioctl_delete_bufs, =20 .vidioc_streamon =3D v4l2_m2m_ioctl_streamon, .vidioc_streamoff =3D v4l2_m2m_ioctl_streamoff, diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-driver= s/vim2m.c index 3e3b424b4860..10bd8c92e340 100644 --- a/drivers/media/test-drivers/vim2m.c +++ b/drivers/media/test-drivers/vim2m.c @@ -960,6 +960,7 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops =3D { .vidioc_dqbuf =3D v4l2_m2m_ioctl_dqbuf, .vidioc_prepare_buf =3D v4l2_m2m_ioctl_prepare_buf, .vidioc_create_bufs =3D v4l2_m2m_ioctl_create_bufs, + .vidioc_delete_bufs =3D v4l2_m2m_ioctl_delete_bufs, .vidioc_expbuf =3D v4l2_m2m_ioctl_expbuf, =20 .vidioc_streamon =3D v4l2_m2m_ioctl_streamon, diff --git a/drivers/media/test-drivers/vimc/vimc-capture.c b/drivers/media= /test-drivers/vimc/vimc-capture.c index 97693561f1e4..adeb7727fade 100644 --- a/drivers/media/test-drivers/vimc/vimc-capture.c +++ b/drivers/media/test-drivers/vimc/vimc-capture.c @@ -221,6 +221,7 @@ static const struct v4l2_ioctl_ops vimc_capture_ioctl_o= ps =3D { .vidioc_expbuf =3D vb2_ioctl_expbuf, .vidioc_streamon =3D vb2_ioctl_streamon, .vidioc_streamoff =3D vb2_ioctl_streamoff, + .vidioc_delete_bufs =3D vb2_ioctl_delete_bufs, }; =20 static void vimc_capture_return_all_buffers(struct vimc_capture_device *vc= apture, diff --git a/drivers/media/test-drivers/visl/visl-video.c b/drivers/media/t= est-drivers/visl/visl-video.c index b9a4b44bd0ed..e8c4216e7526 100644 --- a/drivers/media/test-drivers/visl/visl-video.c +++ b/drivers/media/test-drivers/visl/visl-video.c @@ -539,6 +539,7 @@ const struct v4l2_ioctl_ops visl_ioctl_ops =3D { .vidioc_prepare_buf =3D v4l2_m2m_ioctl_prepare_buf, .vidioc_create_bufs =3D v4l2_m2m_ioctl_create_bufs, .vidioc_expbuf =3D v4l2_m2m_ioctl_expbuf, + .vidioc_delete_bufs =3D v4l2_m2m_ioctl_delete_bufs, =20 .vidioc_streamon =3D v4l2_m2m_ioctl_streamon, .vidioc_streamoff =3D v4l2_m2m_ioctl_streamoff, diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/= test-drivers/vivid/vivid-core.c index 11b8520d9f57..f772069fb1a4 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.c +++ b/drivers/media/test-drivers/vivid/vivid-core.c @@ -769,6 +769,7 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops =3D { .vidioc_expbuf =3D vb2_ioctl_expbuf, .vidioc_streamon =3D vb2_ioctl_streamon, .vidioc_streamoff =3D vb2_ioctl_streamoff, + .vidioc_delete_bufs =3D vb2_ioctl_delete_bufs, =20 .vidioc_enum_input =3D vivid_enum_input, .vidioc_g_input =3D vivid_g_input, diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-co= re/v4l2-mem2mem.c index 9e983176542b..6e36a04d415c 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -1380,6 +1380,16 @@ int v4l2_m2m_ioctl_create_bufs(struct file *file, vo= id *priv, } EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_create_bufs); =20 +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, + struct v4l2_delete_buffers *d) +{ + struct v4l2_fh *fh =3D file->private_data; + + return vb2_core_delete_bufs(v4l2_m2m_get_vq(fh->m2m_ctx, d->type), + d->index, d->count); +} +EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_delete_bufs); + int v4l2_m2m_ioctl_querybuf(struct file *file, void *priv, struct v4l2_buffer *buf) { diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 7f1af1f7f912..402bea36093b 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -867,6 +867,8 @@ int v4l2_m2m_ioctl_reqbufs(struct file *file, void *pri= v, struct v4l2_requestbuffers *rb); int v4l2_m2m_ioctl_create_bufs(struct file *file, void *fh, struct v4l2_create_buffers *create); +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, + struct v4l2_delete_buffers *d); int v4l2_m2m_ioctl_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf); int v4l2_m2m_ioctl_expbuf(struct file *file, void *fh, --=20 2.40.1