From patchwork Thu Mar 3 23:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15415 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 37762C3261 for ; Thu, 3 Mar 2022 23:50:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D219D6118A; Fri, 4 Mar 2022 00:50:23 +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="R6w+3yMG"; dkim-atps=neutral Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 573626118A for ; Fri, 4 Mar 2022 00:50:18 +0100 (CET) Received: by mail-wr1-x42f.google.com with SMTP id u10so8512792wra.9 for ; Thu, 03 Mar 2022 15:50:18 -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=+daEI5+GW8ZpSPL+i4m+9fBs1QBP6dqnssl9Ql77R8Q=; b=R6w+3yMGeyLDx1eYKAGv4i88527ewRrXR4SOt5sFEfAwjjBePqBac8uinj5+X/+s11 3r1X0O+8y/H6vneD6mtnEP+3AluNzlrweKB++FKv5fdKAAd6jSAJ4b+N7MRNDSJtNRYd tkee4eSZCai17Q1JawiNLY1+RHKyIkiIIO6hFIYDzkiGH8X+EROJxZNgpVAGwQOcVGRQ 78IzizntuMS/3wPF87556D71C/179nSCljKjO+0WXr4vfIjmCpXLmehYpwt9ZHTZya9n 7P6AyeJgVczc7VGiqbM7Zdg7GTLcTpWfIk2hI0V6L7q5sKRKhPpkftkA5rNO2nv4wGTq gohw== 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=+daEI5+GW8ZpSPL+i4m+9fBs1QBP6dqnssl9Ql77R8Q=; b=DuWdo3nP2xkNgOWaEPd4fAe6bvQWkJVv8XjA53fq+PCOqKgJgfp0MhRsZUa4yfmTh9 uxxrmtjdIoq9A5vAORkvST6uzAHWlGpoflD5MPGNQbhfA6InKG8VWmoA7blWF55S5GuG CDdIms0MsrtlcNsANRvYja2+Vi9DVpAvA8AIUM5Eo+6NA1fCiRiOSh+cnVtTnvjJNqCC AQBSmI4SR67o/zbcw9TMfgnss9fnVaDxlxBUgZ3YEcwEWPD6YlgMCGF564MDE+4lnWrv YIO9g8OI7+jRbHd5TwhU+r8m3qIWS9XBXEVb+MsygudbjG6fmjoUt9ZOr4sgkbrt4RZK Rq0w== X-Gm-Message-State: AOAM53246h/PWbpVo7B9790INNFWRAR1f1oJuV78wambgv0wrnNmLGKL C0iIYgtLnjFcqwMyVS/Z5Q6KkvsEB676+Q== X-Google-Smtp-Source: ABdhPJxo1zLyH/LqNLukmKP7KvzndkeaaibTn6Le85J46YHUR9iMcTOjBUHrvyO6Zv9gQJj9Ub5nkw== X-Received: by 2002:a05:6000:1c01:b0:1ef:95c5:4dd6 with SMTP id ba1-20020a0560001c0100b001ef95c54dd6mr19178732wrb.671.1646351418114; Thu, 03 Mar 2022 15:50:18 -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 y4-20020adff144000000b001f022290737sm3079779wro.6.2022.03.03.15.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 15:50:17 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Mar 2022 23:49:55 +0000 Message-Id: <20220303234956.1463551-9-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303234956.1463551-1-djrscally@gmail.com> References: <20220303234956.1463551-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 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 Reviewed-by: Jean-Michel Hautbois --- Changes in v5: - None 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;