From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFE39C433DF for ; Tue, 16 Jun 2020 10:00:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3E4A207C4 for ; Tue, 16 Jun 2020 10:00:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728152AbgFPKAg (ORCPT ); Tue, 16 Jun 2020 06:00:36 -0400 Received: from smtp1.de.adit-jv.com ([93.241.18.167]:36112 "EHLO smtp1.de.adit-jv.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726052AbgFPKAf (ORCPT ); Tue, 16 Jun 2020 06:00:35 -0400 Received: from localhost (smtp1.de.adit-jv.com [127.0.0.1]) by smtp1.de.adit-jv.com (Postfix) with ESMTP id E8DC13C057C; Tue, 16 Jun 2020 12:00:32 +0200 (CEST) Received: from smtp1.de.adit-jv.com ([127.0.0.1]) by localhost (smtp1.de.adit-jv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l2OxJuY85Oae; Tue, 16 Jun 2020 12:00:27 +0200 (CEST) Received: from HI2EXCH01.adit-jv.com (hi2exch01.adit-jv.com [10.72.92.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.de.adit-jv.com (Postfix) with ESMTPS id 26ABB3C0579; Tue, 16 Jun 2020 12:00:26 +0200 (CEST) Received: from vmlxhi-110.adit-jv.com (10.72.93.196) by HI2EXCH01.adit-jv.com (10.72.92.24) with Microsoft SMTP Server (TLS) id 14.3.487.0; Tue, 16 Jun 2020 12:00:25 +0200 From: Ramzi BEN MEFTAH To: Kieran Bingham , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Janusz Krzysztofik , Jacopo Mondi , Steve Longerbeam , Ezequiel Garcia , Arnd Bergmann , , CC: Michael Rodin , , Subject: [PATCH 1/3] v4l2-subdev: Add subdev ioctl support for ENUM/GET/SET INPUT Date: Tue, 16 Jun 2020 12:00:15 +0200 Message-ID: <1592301619-17631-1-git-send-email-rbmeftah@de.adit-jv.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.72.93.196] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steve Longerbeam This commit enables VIDIOC_ENUMINPUT, VIDIOC_G_INPUT, and VIDIOC_S_INPUT ioctls for use via v4l2 subdevice node. This commit should probably not be pushed upstream, because the (old) idea of video inputs conflicts with the newer concept of establishing media links between src->sink pads. However it might make sense for some subdevices to support enum/get/set inputs. One example would be the analog front end subdevice for the ADV748x. By providing these ioctls, selecting the ADV748x analog inputs can be done without requiring the implementation of media entities that would define the analog source for which to establish a media link. Signed-off-by: Steve Longerbeam --- drivers/media/v4l2-core/v4l2-subdev.c | 9 +++++++++ include/media/v4l2-subdev.h | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 6b989fe..73fbfe9 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -378,6 +378,15 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) return -ENOTTY; return v4l2_querymenu(vfh->ctrl_handler, arg); + case VIDIOC_ENUMINPUT: + return v4l2_subdev_call(sd, video, enuminput, arg); + + case VIDIOC_G_INPUT: + return v4l2_subdev_call(sd, video, g_input, arg); + + case VIDIOC_S_INPUT: + return v4l2_subdev_call(sd, video, s_input, *(u32 *)arg); + case VIDIOC_G_CTRL: if (!vfh->ctrl_handler) return -ENOTTY; diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index f7fe78a..6e1a9cd 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -383,6 +383,14 @@ struct v4l2_mbus_frame_desc { * @g_input_status: get input status. Same as the status field in the * &struct &v4l2_input * + * @enuminput: enumerate inputs. Should return the same input status as + * @g_input_status if the passed input index is the currently active + * input. + * + * @g_input: returns the currently active input index. + * + * @s_input: set the active input. + * * @s_stream: used to notify the driver that a video stream will start or has * stopped. * @@ -423,6 +431,9 @@ struct v4l2_subdev_video_ops { int (*g_tvnorms)(struct v4l2_subdev *sd, v4l2_std_id *std); int (*g_tvnorms_output)(struct v4l2_subdev *sd, v4l2_std_id *std); int (*g_input_status)(struct v4l2_subdev *sd, u32 *status); + int (*enuminput)(struct v4l2_subdev *sd, struct v4l2_input *input); + int (*g_input)(struct v4l2_subdev *sd, u32 *index); + int (*s_input)(struct v4l2_subdev *sd, u32 index); int (*s_stream)(struct v4l2_subdev *sd, int enable); int (*g_pixelaspect)(struct v4l2_subdev *sd, struct v4l2_fract *aspect); int (*g_frame_interval)(struct v4l2_subdev *sd, -- 2.7.4