From nobody Mon Jun 29 22:20:18 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A167C43219 for ; Wed, 2 Feb 2022 10:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241156AbiBBKrV (ORCPT ); Wed, 2 Feb 2022 05:47:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240017AbiBBKrS (ORCPT ); Wed, 2 Feb 2022 05:47:18 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4017C06173D for ; Wed, 2 Feb 2022 02:47:17 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id b9so39714900lfq.6 for ; Wed, 02 Feb 2022 02:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yv9CJkTA34A5RzRG7XItJLyzPP8c4yOqEtb0dgEMVtA=; b=hsRBWewEhi0L0fXWokAVChGocpjD1gZcIoNItYN1sx8yfacO5cc1QO7CKZ4GqmiZ6a vPl6SJMkQPrFXUJNcA0HInSJ6LKBwRXxhXxAtAVWubQI0RGaCZfjqDHtvbRHIxwbkocZ 9IlEHxnDjHkABfVU8cFBrdMvMbfrRkq/PtiFHyVfC63aj1PCOfk5x5+lsJXLsRCjYRTp 6MPa8KTyYH+QyL7N9j2nXwi++h1CHxaUL4AjKWVKm5uQ3n+Yu0UtiiuoKEoxpzwa2lJB uAVGjKKwi+TEOLeCET+XtyY7bHcVcSMUyn4Gq9urNk2S9ledKWmnyBTSCC6JlUcjRWjo Ue2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yv9CJkTA34A5RzRG7XItJLyzPP8c4yOqEtb0dgEMVtA=; b=odXIW1Li65wXoDAefxMbAo0DOCV0jywtdiqYg5rZ1foYohmAsJkz6o69Zs6LLNEBz2 6J8KrMHzuxoV27Iy2YJ8/EAdbnNUsu0b2XEQs8x7xCgR6vDU54R3GmxmZKxgYIlBBN5Z SBRMsupJ/sOA5kgTa873D5CCxYXzik1quVCuk5RRS0giELAy7vFEA76zf17UJssxppNC Qs2f/XcRFbSEVfqgDtczUYOY/7Hle84VaQVF3+Ge5BKD33yjRYevNLBdT+jXp2M3vmd9 fHleJueGpqQe06IIjJZt9JQBBaS74LnjMlOoNLgaGavX5vCebNjS/F0aWe+TWZrBA7ER yx4Q== X-Gm-Message-State: AOAM532AexKDP51gZyaj2lLUFewk+oUT/SP6sxXr238KKHH/G/6jcRKP KgGja5IuQxK65GV03Vitiw2x2Q== X-Google-Smtp-Source: ABdhPJwmRvDR5kh3gu0N9Ob6zzWoEJRtqALJTSm03MXoav1csitHbCd7sukTsMwhJozmjUDTr7584Q== X-Received: by 2002:a05:6512:2821:: with SMTP id cf33mr22093956lfb.37.1643798836263; Wed, 02 Feb 2022 02:47:16 -0800 (PST) Received: from cobook.home (nikaet.starlink.ru. [94.141.168.29]) by smtp.gmail.com with ESMTPSA id v5sm2844143lfg.124.2022.02.02.02.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 02:47:15 -0800 (PST) From: Nikita Yushchenko To: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Barinov , Nikita Yushchenko Subject: [PATCH] media: rcar-vin: require master VIN only for CSI source Date: Wed, 2 Feb 2022 13:47:00 +0300 Message-Id: <20220202104700.3329055-1-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Hardware limitations on VINs that can be used at the same time cover only CSI data source. For parallel source, any single VIN can work. This patch moves check for master VIN availability in rvin_csi2_link_notify() below processing the parallel case. This fixes media-ctl usage on KF board when both CSI and parallel cameras are in use on the same system. In such a setup, VINs 0-3 are used for CSI cameras and VIN5 is used for parallel camera. Signed-off-by: Nikita Yushchenko --- drivers/media/platform/rcar-vin/rcar-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/pl= atform/rcar-vin/rcar-core.c index 0186ae235113..038ee187f95a 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -826,11 +826,6 @@ static int rvin_csi2_link_notify(struct media_link *li= nk, u32 flags, vin =3D container_of(vdev, struct rvin_dev, vdev); master_id =3D rvin_group_id_to_master(vin->id); =20 - if (WARN_ON(!group->vin[master_id])) { - ret =3D -ENODEV; - goto out; - } - /* Build a mask for already enabled links. */ for (i =3D master_id; i < master_id + 4; i++) { if (!group->vin[i]) @@ -878,6 +873,11 @@ static int rvin_csi2_link_notify(struct media_link *li= nk, u32 flags, goto out; } =20 + if (WARN_ON(!group->vin[master_id])) { + ret =3D -ENODEV; + goto out; + } + channel =3D rvin_group_csi_pad_to_channel(link->source->index); mask_new =3D mask & rvin_csi2_get_mask(vin, csi_id, channel); vin_dbg(vin, "Try link change mask: 0x%x new: 0x%x\n", mask, mask_new); --=20 2.30.2