Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp941660rwb; Thu, 15 Dec 2022 04:38:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf6FpmuJmsTOQo7mGW+01/tA9OpbkIjQTiUIpAiRqcRuxPROgpkpyjcjCpKH8dVSi9RRLYBn X-Received: by 2002:a17:902:ccd0:b0:186:f57d:8573 with SMTP id z16-20020a170902ccd000b00186f57d8573mr32053652ple.2.1671107926717; Thu, 15 Dec 2022 04:38:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671107926; cv=none; d=google.com; s=arc-20160816; b=c1h7cIrTDVYKiBMmncYbTaYNINdkr9LU4WeyMkI7NtMPKmtZ7vfbP8XRORfJ9C0FhS ZlfPG6m0p9jnsSw9dMu1K/dPvU58zwYGPL8Kn6bMc5YImUQKHeh5mq2uVR2kNbqDmt8o FT6AK30MFVWek6BKV16USOdrIyn9/AKS5kpeL3/3Uckzazol4zsOZp2qYnvJ1trhgFg6 6uNr8CLGnc+TyVYIs6kriLKnmSfZeWE35kUQylXHRMYibBJhsJo064WiBNzI+qjZI7C7 RUk8eV5DOPAkrSEnDU4XYljXlYad8dmOfK1jUaJ8vn+hF+J/6R4YPlFodFm+7v7FxU4w f5Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5OW2Pi0q7s0xqJTdk/BBBUi4swn8/0W8NTcEMrzSEAc=; b=p2vG0eLqr0mb8Ggw1yi7t36avJyw/BOVhG55+VDufw5i9AoGB86ikkpolDk+nsVo89 wu++PB9/kyg+94N+/o+5uIhYp92uKY4V3xKmudcsL8hjtfO4b/zzL4eX8cJhVdpQB3e0 +xxQCOPWN9hi5dqJpz1shomDNHL4mh7+yZEbDWLdB6asieLm4PBerAJAa5f5d2DvdUOv 4n6wL3QC9fDonjj0i/TxX/RqKV7zvZ3hY6NWYv9OSlcOy8HMUQIogQXY/gQMRcDj0/Yi Mpaev7LlUncQWCT8X6Nfv8VYf0YjwFKczaNhVPdhN4jcTFgJUCJQV34W8Pbelss7T/KK QmVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qmMpE3Xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q22-20020a170902789600b0016f1781307csi5481144pll.303.2022.12.15.04.38.37; Thu, 15 Dec 2022 04:38:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=qmMpE3Xu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229798AbiLOMSV (ORCPT + 68 others); Thu, 15 Dec 2022 07:18:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbiLOMRf (ORCPT ); Thu, 15 Dec 2022 07:17:35 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6122EF23; Thu, 15 Dec 2022 04:17:28 -0800 (PST) Received: from desky.lan (91-154-32-225.elisa-laajakaista.fi [91.154.32.225]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6B0DA1837; Thu, 15 Dec 2022 13:17:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1671106638; bh=G9pIXgNUK1BcwfyFO2N7rkhLQObklcBOTgegYd4bZns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qmMpE3Xu+d7KsyNGF6Oq9kWqFkK1NBqLDGceEjn9hU+FlLpoVA2Qnpm7LetthxJqN GMU6k1bo2WbsTmr6H9fxNYv7KyZZLh5wdW59NHJk5pGMctYhOugT0fnn155Mefkird QBxalA9lGDtTJVEMn+4kYI635EZAjiJMtCiG/BSw= From: Tomi Valkeinen To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, sakari.ailus@linux.intel.com, Jacopo Mondi , Laurent Pinchart , niklas.soderlund+renesas@ragnatech.se, Mauro Carvalho Chehab , Hans Verkuil , satish.nagireddy@getcruise.com, Tomasz Figa Cc: Tomi Valkeinen Subject: [PATCH v16 14/20] media: subdev: add streams to v4l2_subdev_get_fmt() helper function Date: Thu, 15 Dec 2022 14:16:28 +0200 Message-Id: <20221215121634.287100-15-tomi.valkeinen@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221215121634.287100-1-tomi.valkeinen@ideasonboard.com> References: <20221215121634.287100-1-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add streams support to v4l2_subdev_get_fmt() helper function. Subdev drivers that do not need to do anything special in their get_fmt op can use this helper directly for v4l2_subdev_pad_ops.get_fmt. Signed-off-by: Tomi Valkeinen --- drivers/media/v4l2-core/v4l2-subdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 458124da9c5b..c02048e388d1 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1389,10 +1389,14 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, { struct v4l2_mbus_framefmt *fmt; - if (format->pad >= sd->entity.num_pads) - return -EINVAL; + if (sd->flags & V4L2_SUBDEV_FL_STREAMS) + fmt = v4l2_subdev_state_get_stream_format(state, format->pad, + format->stream); + else if (format->pad < sd->entity.num_pads && format->stream == 0) + fmt = v4l2_subdev_get_pad_format(sd, state, format->pad); + else + fmt = NULL; - fmt = v4l2_subdev_get_pad_format(sd, state, format->pad); if (!fmt) return -EINVAL; -- 2.34.1