From patchwork Fri Dec 3 22:42:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15036 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 AF9BBC3251 for ; Fri, 3 Dec 2021 22:42:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6DBF560866; Fri, 3 Dec 2021 23:42:44 +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="hntaFjft"; dkim-atps=neutral Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7178560868 for ; Fri, 3 Dec 2021 23:42:41 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id y196so3473513wmc.3 for ; Fri, 03 Dec 2021 14:42:41 -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=0WKidYMr4tP1cU3yTOjjBxaWyBicoAkXnprcx/zLHpo=; b=hntaFjft40kN1aAwgi8HsmqxwqYqKXFP8HoYTxNl/IV1FEuTmKYrHx8ciuiHQHlQEH 1INeBs/SzdFtgf8aNwmU2TzwnX878k63VH/ceLSSFmZKhojD7c5E+nKvCw/p/BLEljYJ zD4+U38tFbx3tkWJzuNIjurNPjQuUH7bZWB2bgryoQZFCoMDi7zBOk95B96k/06ruMkx e0oZgJ+CkKJtZyJdmZhWBWPAX8avn/r9r/9C24SNZD8v5StYnvLcx3q4g4oM9X1GLsrp K73s1g5yKKWCVKROmTjpj6pqwnqVHo8/jcBCvxWfU9MY0DKlV9KwNaGLPBL8VGBwIU9a VcgA== 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=0WKidYMr4tP1cU3yTOjjBxaWyBicoAkXnprcx/zLHpo=; b=02ZbgkcH0pnUd9RZ2A5CiSksTOcRuCcPdmBcdgIP8SPGArh2F87qTJCeguR9j5YT+e aeHIUmnqWYcihDUMV++Yi5Jivc338SX2wUuNqWkvacGfwv9xXExi/KxbE7IGSIaEtBTg qnZWj5GmwS4UO2ZH3oACcJD1wZD4Es8t+FrC/fOS0pjm8R3xjsBzBDUASTeRUilHu95h ZOa8IHH1lnnVFEegB7CpHuBVl/KkrbR/A8Q93aJAasW9DMkt5NZiFvsYhjaVmYoG+AEn aViVM7YZKMMu0Ms9Q51CQYpzwGiJSyCgiJ9364mFk4N8TPYhZ4FLyHS/T01awMOzNLw4 ir5w== X-Gm-Message-State: AOAM530QcSXL2hz4NOrw1lm6w3vKq3LXVzhslzahNQ952ZGgJgR34wFa f9Mtvsp47xcI+JxTbVd0Gtl7+DPYZcs= X-Google-Smtp-Source: ABdhPJwOciNIXK0LpdHONw0KrpGVgLHjMSOVMgvXcRpabNiRlKXtYUKCXg35gIL3idfPDxykYV37rQ== X-Received: by 2002:a05:600c:2e46:: with SMTP id q6mr18440188wmf.6.1638571361264; Fri, 03 Dec 2021 14:42:41 -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 o25sm3939919wms.17.2021.12.03.14.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 14:42:40 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Fri, 3 Dec 2021 22:42:29 +0000 Message-Id: <20211203224230.38700-7-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203224230.38700-1-djrscally@gmail.com> References: <20211203224230.38700-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 6/7] 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 Signed-off-by: Daniel Scally Reviewed-by: Laurent Pinchart --- Changes in v2: - New patch 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 1215bdb8..4386d3e9 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -656,6 +656,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;