From patchwork Mon Jan 31 22:33:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15312 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 75E55BF415 for ; Mon, 31 Jan 2022 22:33:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2207F609AF; Mon, 31 Jan 2022 23:33:50 +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="VofqH9fL"; dkim-atps=neutral Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E6396609C3 for ; Mon, 31 Jan 2022 23:33:48 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id h21so28264904wrb.8 for ; Mon, 31 Jan 2022 14:33:48 -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=7/ZhzXiT0UrOoXPUWRn+76ynSQgMauvrXLRXPurs0UM=; b=VofqH9fL7enCJPuvFWUyCnecI0iys1XJltcnWgH+r6U0nki4f8SLAwxQX/rbHbrO32 SoaS2MrFTvjhRR3k8ZFP8RCoaI5Xge2u9xDEvezSZPXVi4CPReuLNiV1IoELYUAJ8GCh F+Zqb8KA+CXJmRGu111GTG27V4LpYcX8Dp3JOq6ZC+8e091KK9AeVMN3HFunaCpOzubJ jrRApjkys7q1Sp6iK7e4SmFTOCFHjwmykxnpsMjKqW6qT1nCNoO+GnGfSwqF0tUTFJeL dg4VotEbm0BdmWyfxSDoSwN1BtJxhwI10IYO0nTcIY+8rHGbyjUe1NvdY1BqBFGV6YjC gfLQ== 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=7/ZhzXiT0UrOoXPUWRn+76ynSQgMauvrXLRXPurs0UM=; b=07SGnw8tFvFkl13CdwJqmn2Cul1RuHpeP0cMLRGTEuWl86inMPwv6Eq6qSrml0QuBr U0TA+ok82ZvfglTwoyTLHsm7u5jp8doz7SXNsX51WjNFMY6fUV1Dkst5h+yIQo9jcIlC fBBNDiKKLlUiDOzQYChC+v+L5AGkwAMopoqNE8ViOm+iXAL0aKQmkwuxVAkCZKkS1fiL FIfn95kaQ5RH34uJZevmICTGG0wS45viL1iARSBLZ60TTQKuymtJuEUL5CEFWix0/5/C 1mhvMJGKVtMQGKs5mYUL9rq8UeZEzulm6nhb7RLNWw54CTQmwwzuERHJDoXSYt+jWFjA aHZA== X-Gm-Message-State: AOAM531kG74/SgBDXIU48hTeawxCeZ7HKyvM+fcKr23EucDeQMlbYXMA fKZ4WFZhGknx9+ScbCxEE6dkkgDuCF8= X-Google-Smtp-Source: ABdhPJy5YC3jI5KqOGfeIQy9wtZLMK0hU3hePxkChXsTOErwqPGOe8oW6ad0XmQmpI2WZDQITbnmFg== X-Received: by 2002:a5d:56cc:: with SMTP id m12mr18593297wrw.157.1643668428765; Mon, 31 Jan 2022 14:33:48 -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 q2sm6986740wrw.14.2022.01.31.14.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 14:33:48 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Mon, 31 Jan 2022 22:33:29 +0000 Message-Id: <20220131223330.61563-9-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131223330.61563-1-djrscally@gmail.com> References: <20220131223330.61563-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 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 v4: - None 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 6c5617cd..b3199aec 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;