Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1972502lqp; Tue, 16 Apr 2024 03:41:33 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUxdJjc5artnHkb//5e39tau9NmaZFOw6AgzOL3vUXPEDIctzWdtc5mwrdGxFtxXxP/bx8xwk0ZNnuocFlTaQfGOu9XISllUYj9un+dtA== X-Google-Smtp-Source: AGHT+IF50zfkVpz5cEXDAQSMPVXOX3W9p6EvjLz32pczzT20+A+ZKiM0dqJUtVthDOainjDnjzFm X-Received: by 2002:a0c:ea49:0:b0:69b:1f75:e700 with SMTP id u9-20020a0cea49000000b0069b1f75e700mr11728655qvp.33.1713264093527; Tue, 16 Apr 2024 03:41:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713264093; cv=pass; d=google.com; s=arc-20160816; b=UpqLSXC6UTtvs9P0xjfP+hES2qGke+Rnr0gvgwncEvGAZDGIb4aM2Zh72QNPpIc8bv N6BJr99AMEQPpEWjSG9ipGv1acf6ktgIR8/VGFp5RdMQNf0OHUeXbanFSRuMjnZSMdgN IO4eboHT12c8nkhW9Bp8kyGpgvT28JUSZIJrKA+ezftmLFcWHKLSc7b1Cj+JmidgUAz0 0IIZ0s1cPZgmq1R9gqp6KzdrkufO4/M6/sHQ8EQnA8km7vP/yA554kCjQj2tuD9z8xiX 2hmJykCMU5oQoxfAj2gthZXTt+0ow+mgr7APRML4hGRtRZdaHaJvXaIci4S4C09lnOJR OtOA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=eWx2Kpbtub7ppqOBZGqwQkOESKbR8xDF2YSYcFIKhQM=; fh=KsVfM5wJAwSmWlBDhQUIuzi3h8aTwgJEe33eqLJyRj0=; b=XSHUladfa484sQ2RgXUBuT4pZ1ecbW9A0b4PM1pM2ogbi//YV7c5Yh7pm2ZesZ7A9O /EmqufhpVDq44NXoSUk9GF5tJkC53WEtvgZuJClEx3TkExjWxJ0mNDJjYOpfZrZinA5B i91mVw6vZAUJ149zAWZTkY20YiuM0iNSlSLqshd140c9CMuLa9iDpWOXUmtdRCb3oa9V gJ9KIN9QsAiwRkMsx4WH6b91nJig2J18e0kKnR9wBlIzJOZ93fFxVYU0+LKuzO1UEpHt +z2Wsn9Eeyfsj2Kjk/2P/hc2cTcbrqFMMJmeX//fUoOpC2wADhNi1+KVN4vDoMoJdhYm p7iA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="dRFq/lmw"; arc=pass (i=1 spf=pass spfdomain=ideasonboard.com dkim=pass dkdomain=ideasonboard.com); spf=pass (google.com: domain of linux-kernel+bounces-146647-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146647-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id fo14-20020ad45f0e000000b006991f34e800si13756235qvb.453.2024.04.16.03.41.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 03:41:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-146647-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="dRFq/lmw"; arc=pass (i=1 spf=pass spfdomain=ideasonboard.com dkim=pass dkdomain=ideasonboard.com); spf=pass (google.com: domain of linux-kernel+bounces-146647-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-146647-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 39A271C20DC5 for ; Tue, 16 Apr 2024 10:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29E7512A177; Tue, 16 Apr 2024 10:40:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dRFq/lmw" Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 98E3E1292FB; Tue, 16 Apr 2024 10:40:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713264039; cv=none; b=jMKX71PZNk3y6LDBQQWjxnjirpE9Kk+8++8PeYhN5D9DW1yL1L/90SSprSEGvqknWmjJTWLGEVTbDQkeR9qTIuITBnJhKgOtsj1MlEbcr6kwC0EYNV1jTlR+H8D2BmHGi7JEdvTFAYdklUnXh4NFl9E935cS1HsUdAx4w83pg1I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713264039; c=relaxed/simple; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cJAOsOnXwTNV8RWoCEtm73/sCCD5vKM1SZWE7kW8ygwpZ/T6Q2fS2UttQ/vWWVRN52yVGxnOSXBylg92uAVKcnvM+W7EJiAq4V6qMKGi5vPvZaHIsVQYdxy/LYduvtYY+SVoQyNojzkG3SJi0UgmR1L6IWtv4vveId9c2AuE7Pc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=dRFq/lmw; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Received: from [127.0.1.1] (91-154-34-181.elisa-laajakaista.fi [91.154.34.181]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DB1EDFB; Tue, 16 Apr 2024 12:39:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1713263987; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dRFq/lmwkYuEJr0hgJmz8pLXj5dZW73qnyQEZZHYJy6nwbQ03mNv3TP2V/4sqQhuG 3N0DzLk/jo6TJqBvQVzqpqOb2JMJeab8psw20Mz05gd1LP03ccAfSAQvavHVIfShcg FZcaF2ji4okO5gGUgVLoSAeK2z02UpJWMgUmDWkg= From: Tomi Valkeinen Date: Tue, 16 Apr 2024 13:40:02 +0300 Subject: [PATCH v4 03/10] media: subdev: Add checks for subdev features Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240416-enable-streams-impro-v4-3-1d370c9c2b6d@ideasonboard.com> References: <20240416-enable-streams-impro-v4-0-1d370c9c2b6d@ideasonboard.com> In-Reply-To: <20240416-enable-streams-impro-v4-0-1d370c9c2b6d@ideasonboard.com> To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , Umang Jain Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2250; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=Z0RyfSEDzUrNB+KTFQ++Lirh0TD9nIjn5FaVBuc0a8A=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBmHlWczp0NVOXeX7PWRhsOYe9eSxPpZupNvdBoE oY7C/WF7tSJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZh5VnAAKCRD6PaqMvJYe 9WO0D/0Us/wOh4WFnUkSRkZR+1R7scfpyMLbCJNRInths96aUjRlsRE73QpkA6akOtmU4TZ8Yek eGI04oA8TTk1T/4gOHyH6uncwqqruP1FGkgiai2+NjvPVxp8BFqTzqva55QnRc51vIgViyLt9lg 3lVqE96DOnXjyyF6o8c/BV4+qrbAlOwMqK6Fh1G8raLZOAN0xXkCA7wodhBDDt5qdyM45WFCvEl QGpowpZP00XkLZsw1Xx1VLGi6irqDg0BNbCpC4NmBQmU0lPDOtW35GTa08gWupzAkfHp7aBg7Sw 5WtgWcZxFPjSWnbfyw7j1JgRYWX1MWC04cu0rnwzd/d7V6n9D8ODkzjoSd+hj7pIugPWxTY+CbN ikDQxREjxMmBuHrMQ378GkMxVejXah/QndhMiFWFeKYuNuMjJ2HsmxtMW7a6Oz/7QO2CVtr2p/D C1KtDhH3t38lU3TQO0+O9tzx1eFDCGN1cgcBHMumosFqCKq0iFFMYrh/m5EN5A8cmhw9sf0zkPg +FPO2C8U02uqD9QyaazKj20Q85kZdAfWhtFaUmBmUCHaQoVVKBO+gaM3LueeplyFk1ETjmwRAjN EFOHKcUJEFQhdoBJP/tmipyieZKMuQiDlX6OKzbVGJPl/rvmLrkl5RbF7Jy1j+keOE97jSLshUs Oy3bU/q2+r7FzZw== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add some checks to verify that the subdev driver implements required features. A subdevice that supports streams (V4L2_SUBDEV_FL_STREAMS) must do one of the following: - Implement neither .enable/disable_streams() nor .s_stream(), if the subdev is part of a video driver that uses an internal method to enable the subdev. - Implement only .enable/disable_streams(), if support for legacy sink-side subdevices is not needed. - Implement .enable/disable_streams() and .s_stream(), if support for legacy sink-side subdevices is needed. At the moment the framework doesn't check this requirement. Add the check. Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/media/v4l2-core/v4l2-subdev.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 4a531c2b16c4..606a909cd778 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1533,6 +1533,33 @@ int __v4l2_subdev_init_finalize(struct v4l2_subdev *sd, const char *name, struct lock_class_key *key) { struct v4l2_subdev_state *state; + struct device *dev = sd->dev; + bool has_disable_streams; + bool has_enable_streams; + bool has_s_stream; + + /* Check that the subdevice implements the required features */ + + has_s_stream = v4l2_subdev_has_op(sd, video, s_stream); + has_enable_streams = v4l2_subdev_has_op(sd, pad, enable_streams); + has_disable_streams = v4l2_subdev_has_op(sd, pad, disable_streams); + + if (has_enable_streams != has_disable_streams) { + dev_err(dev, + "subdev '%s' must implement both or neither of .enable_streams() and .disable_streams()\n", + sd->name); + return -EINVAL; + } + + if (sd->flags & V4L2_SUBDEV_FL_STREAMS) { + if (has_s_stream && !has_enable_streams) { + dev_err(dev, + "subdev '%s' must implement .enable/disable_streams()\n", + sd->name); + + return -EINVAL; + } + } state = __v4l2_subdev_state_alloc(sd, name, key); if (IS_ERR(state)) -- 2.34.1