From patchwork Thu Apr 7 23:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15652 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 47EBCC3256 for ; Thu, 7 Apr 2022 23:14:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7029A65642; Fri, 8 Apr 2022 01:14:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1649373256; bh=Yg5PcfuwlKGhos93dHQZyVKmxWN1mAWgFNBAojaKv60=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=0TJyqhZvjicgmXnicduvJT/OgHNNeXyzGimY0GcLn/ZqhUVqDxgOt6kmtPaBNr4JO lMPAH2s+rlNNAV/UEYyByqlA2Q5Xhz0UQTIB5cs/EQxnwtrJvJnXSxFDJ5V8lVW9D4 E4CymtIflZsJakc0TEyhnPG9Oiu/MnnNUC+GfrErqksvwPmQgp5wv4f8z6EZvPlTBa WgNo5fJzN0TH6zpE4PB4crxmPYghrzjvueVhWxNPFD7twu8lnGJIgUDTeEPPXzgWmJ QN/YKJyUjwqjpYail3UhDskjiCVSxib8niRjOX6GL9bwhOGwzwTqubpx8zEzjWvz1y TmL5ipjuKF3rQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 01375604B8 for ; Fri, 8 Apr 2022 01:14:14 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ZJAndrt3"; dkim-atps=neutral Received: from Q.ksquared.org.uk.beta.tailscale.net (unknown [178.237.134.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 11584880; Fri, 8 Apr 2022 01:14:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1649373254; bh=Yg5PcfuwlKGhos93dHQZyVKmxWN1mAWgFNBAojaKv60=; h=From:To:Cc:Subject:Date:From; b=ZJAndrt3tdlcBovUvSeMc8il8jZrQKxWFHzYpxEBdey7bt+d55MMTojxe70fwjN4M lJF458msNg9nxHCcvLZKkE09RqKr+3oEWNfNCtuctnOTqJTaieqvfZHixSHD1gYijS AXM+R9k8CowigiifMcJ3rNxzrYdKojvReiSTVA/4= To: libcamera devel Date: Fri, 8 Apr 2022 01:14:14 +0200 Message-Id: <20220407231414.97058-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] ipa: ipu3: af: enforce grid size restrictions 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: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Provide enforcement of the selection of the block_{width,height}_log2 parameters to the capabilities of the hardware. While this selection is currently hardcoded to the minimum, providing the restriction now allows for further dynamic sizing in the future and documents the restrictions directly in code, making use of the already existing constants. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- v2: - Finally actually fixed the clang compiler by also adding the kAfMaxGrid{Width,Height} constants too. src/ipa/ipu3/algorithms/af.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index 0170a3728892..a33c229aabea 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -168,6 +168,25 @@ int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo) grid.height = kAfMinGridHeight; grid.block_width_log2 = kAfMinGridBlockWidth; grid.block_height_log2 = kAfMinGridBlockHeight; + + /* + * \todo - while this clamping code is effectively a no-op, it satisfies + * the compiler that the constant definitions of the hardware limits + * are used, and paves the way to support dynamic grid sizing in the + * future. While the block_{width,height}_log2 remain assigned to the + * minimum, this code should be optimized out by the compiler. + */ + grid.width = std::clamp(grid.width, kAfMinGridWidth, kAfMaxGridWidth); + grid.height = std::clamp(grid.height, kAfMinGridHeight, kAfMaxGridHeight); + + grid.block_width_log2 = std::clamp(grid.block_width_log2, + kAfMinGridBlockWidth, + kAfMaxGridBlockWidth); + + grid.block_height_log2 = std::clamp(grid.block_height_log2, + kAfMinGridBlockHeight, + kAfMaxGridBlockHeight); + grid.height_per_slice = kAfDefaultHeightPerSlice; /* x_start and y start are default to BDS center */