From patchwork Tue Dec 7 22:45:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15074 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C39D5C325A for ; Tue, 7 Dec 2021 22:45:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5460060592; Tue, 7 Dec 2021 23:45:39 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nOSCQctt"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AFB16087A for ; Tue, 7 Dec 2021 23:45:34 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id i12so482685wmq.4 for ; Tue, 07 Dec 2021 14:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uxWeAh8AddECwF8byMMsyWIm2E9jJoMH1ttCbZiwcMk=; b=nOSCQcttndzAk+ibs/u3xgESsN/qiCxBfybCdJk7xPVPG96Mr1T307Xw4hcYVUVRtl YSQleA/I7fv7Lz9ti9R3RWNEcRmOcVOIxz3ZOt3+OJlwNMv6jMmtICLH3BctkuVE22No 9pD0Jlh5OXX0gSuO2LwQcMbWqVhWKjKPHC6H150paLVgPraM385J9aiHGBBVX5unc6XS z4cOFlDiLmCXb5R5AdA4Knmj2VDTy6VRdW8gye4lwFBnrBwac82FRIVzhcj+HcJwrv+3 5HytAJ7+LjnT10ClGCtj3vT6f5L7P5vfTEHBzIEl+8sSRnFz3TMh/6qLVVGIu6y/RxNH dNJQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=uxWeAh8AddECwF8byMMsyWIm2E9jJoMH1ttCbZiwcMk=; b=bAreTVNL4irYhRtjnWH/KVz0ua26u70HRhBuKdEgsmDYwjBwNzzjMPVxbpdrlt5PwD nZdZsJY0ZCuhq2pdxhNmkFRZ9kPUmUsdLeOn2gE9ggT2ebjIKkJCpE0ZGwDnl86YfBuf 4IWs8ExAy1rtGYsEH83JfPk35ag+6gBP/3Gt+OI1G5VP6V/TiyxNMzktU0bbuSy0aAx+ AWNFrfpGdFZU8+ebb4rwpD1NkV4WnCvdushtoULRmbR8KmN0BX/tubtIwJQ33mLo46uZ 61qBymajxXwfeRRd5GBMxT9Nk7JnplduP0gb9I6PUdCJUwBFogWRyX9a1/C4xex8ckoA /FCA== X-Gm-Message-State: AOAM532QdPe07BqY6294rXSbp601NrDjA8jVQqBqhYkPSL0mpR+OVvxZ 9diTxswWd4EGG85eKUQFrMgXqlM9iys= X-Google-Smtp-Source: ABdhPJzx8ZvVLGVQMCOb6TEL9J+nH6GezH0/CWGKWFYMdMb1TONYIcZF94PWBsxHYOxgnGxqEth3PA== X-Received: by 2002:a1c:1dd6:: with SMTP id d205mr10493453wmd.77.1638917134201; Tue, 07 Dec 2021 14:45:34 -0800 (PST) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id y12sm980332wrn.73.2021.12.07.14.45.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 14:45:33 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Tue, 7 Dec 2021 22:45:11 +0000 Message-Id: <20211207224512.753979-9-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207224512.753979-1-djrscally@gmail.com> References: <20211207224512.753979-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 8/9] libcamera: ipu3: Pass lens controls to config info X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When configuring the pipeline we want to share the controls for any VCM device against the sensor too - pass them to the lensControls member of configInfo Reviewed-by: Laurent Pinchart Signed-off-by: Daniel Scally --- Changes in v3: - None src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 31322062..03824eee 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -660,6 +660,11 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) ipa::ipu3::IPAConfigInfo configInfo; configInfo.sensorControls = data->cio2_.sensor()->controls(); + + CameraLens *lens = data->cio2_.sensor()->focusLens(); + if (lens) + configInfo.lensControls = lens->controls(); + configInfo.sensorInfo = sensorInfo; configInfo.bdsOutputSize = config->imguConfig().bds; configInfo.iif = config->imguConfig().iif;