{"id":25441,"url":"https://patchwork.libcamera.org/api/1.1/patches/25441/?format=json","web_url":"https://patchwork.libcamera.org/patch/25441/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251210005354.44726-25-bryan.odonoghue@linaro.org>","date":"2025-12-10T00:53:52","name":"[v7,24/26] libcamera: software_isp: lut: Skip calculation lookup tables if gpuIspEnabled is true","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d41e5eb8481fc103a2c49de9204e1adfdc672e39","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/1.1/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25441/mbox/","series":[{"id":5645,"url":"https://patchwork.libcamera.org/api/1.1/series/5645/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5645","date":"2025-12-10T00:53:28","name":"Add GLES 2.0 GPUISP to libcamera","version":7,"mbox":"https://patchwork.libcamera.org/series/5645/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25441/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25441/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 2363FC3257\n\tfor ;\n\tWed, 10 Dec 2025 00:55:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D182A614A3;\n\tWed, 10 Dec 2025 01:55:18 +0100 (CET)","from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com\n\t[IPv6:2607:f8b0:4864:20::42e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 53F5A614A0\n\tfor ;\n\tWed, 10 Dec 2025 01:55:16 +0100 (CET)","by mail-pf1-x42e.google.com with SMTP id\n\td2e1a72fcca58-7b8bbf16b71so6887963b3a.2\n\tfor ;\n\tTue, 09 Dec 2025 16:55:16 -0800 (PST)","from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp.\n\t[150.147.107.6]) by smtp.gmail.com with ESMTPSA id\n\t41be03b00d2f7-bf6875cc8eesm16057762a12.16.2025.12.09.16.55.12\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Dec 2025 16:55:13 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"qZ0WmSzy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1765328115; x=1765932915;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=0x9sYofuRKBarctBdgKuhUSV0fpuyAnEk7YI+eA7X6s=;\n\tb=qZ0WmSzyvPwGdP5nyUjvS0LcH+CXYT433ZREIHCgYhxAhpPHX4Vu0vXdRC/WjffxX0\n\tndGSDM58YTkXe3++gKllmbC3AHLVtArIHjMWCG+8HYDdy2oyQb+2/ximBD72Mng1l1QU\n\tsT7FwNQWUyNWGy7rqWag+eIJxlA40yVT3FlHT688lNtuYXTuVRsRamL/NS8zPXKmq9WL\n\tqzMyvxVfWiNt8i/X0tQa6s5sLvmyaqR6WL8hExwCrYQAyKKIZmk1A24KN/pTVa1Qgi5u\n\tnFXL29LQb5dS+teBsVb9aqGLEu4yoczJskb1XDvjqCeA+Tw6UFelCJ4nsd2ZiqisdsUC\n\tspng==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1765328115; x=1765932915;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n\t:to:cc:subject:date:message-id:reply-to;\n\tbh=0x9sYofuRKBarctBdgKuhUSV0fpuyAnEk7YI+eA7X6s=;\n\tb=B7L+wYC/3yRKq0CJZpQYhlwi1YLeQO+SWd2LU6zHgkkewlDu/YeECwt1TymMAkog6B\n\t6HUe5NC3ZB4DhL47UewYJzFrvEdC17vpO34gM0WR0GQVQpmD8Kiw+g74o7LtQNOdvlET\n\tx8fX1ewc3kQ0Swt+4lmJreXKOF3kEz6QiA6WR8HtwyUg7yxUa5qigFbLP/ThCBL2YPdw\n\tGxryV9v5uQU3KTWJOsIvnohv526Ov9gGTInUC7wx4suc4RKryEN6bsSxvmxCyEM3i/ba\n\t35cz3VbGxEBd4z/w3J3lx5y6aFM4SDg5nQGcKImsh8r8UpttGepxK9mKMpbt9KKKM9tp\n\t2Oag==","X-Gm-Message-State":"AOJu0YzDeHQujTxRdVL7NHglUMRA4zJqoGxXcy7vJGuquLd5UtmpeJ1n\n\tGhGAm8TaS9ijXSJWj5pbAfztHlZhd3xKqj+kB0iJqERmPzy1cQnFRNFveY33UVbaxZGW3ZITM19\n\typbf5","X-Gm-Gg":"ASbGncsyYUaVQuACRdLzJTOs57icwEg3tkA/fCM0VScTMGmXGNb0ezRZmMPBZuEYQgu\n\t/Rob4OsCn2t/ia/9bFGA1KfaX4NAn+3TOVGUqTkTtvTUutmtvp+pkRS67kVNxTqJFDz9g4I5vuY\n\tf5MnRazvZRphjVfx2X3JRi6N5r3uHhaZAe3ysSrGsAtVBMwjaGfEoH369cNO1GHBu2DUhHfHDEa\n\t4CTRXJRJWmwp79sMVOLeN0pVgw7EL2faLhoFfmB3tNFxeAvQnyVUajEBtRZyPfc1aSYtJOk/4RG\n\tWeoCrebqsNDhpCKn+3GfiVIYXFstEDMu6itReX4KpaDVcBvI8057WvPaOyyhXJ9yfv5YhGwCiBd\n\txz0VTnFzZSrEhADW9nxIeFAk6NHxGpWHPLdb2ue8qktQp87EMUJf2m5ETsclqn3wdUK/IgPU9Zx\n\tjUAan0U+KE4x9aOgAD41BmN2AYevSWlPmamhbnvlVFfXsU1+7He4jJd3bslb3367Ck","X-Google-Smtp-Source":"AGHT+IEIhWExzt6GfB5dVk76vELMHuBy7GkUEXM4GCaeNsCmdfcAJ6rYcBEhVH0aRKVXwEwxBkRVIw==","X-Received":"by 2002:a05:6a21:328f:b0:34e:1009:4216 with SMTP id\n\tadf61e73a8af0-366e0dea492mr561778637.24.1765328114542; \n\tTue, 09 Dec 2025 16:55:14 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Bryan O'Donoghue ,\n\tMilan Zamazal ","Subject":"[PATCH v7 24/26] libcamera: software_isp: lut: Skip calculation\n\tlookup tables if gpuIspEnabled is true","Date":"Wed, 10 Dec 2025 00:53:52 +0000","Message-ID":"<20251210005354.44726-25-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20251210005354.44726-1-bryan.odonoghue@linaro.org>","References":"<20251210005354.44726-1-bryan.odonoghue@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"On my reference platform Qualcomm RB5 sm8520 the qcam application CPU\noccupancy drops from ~100% to about 95% of a single core so this one change\nsheds aprox 5% CPU usage.\n\nReviewed-by: Milan Zamazal \nSigned-off-by: Bryan O'Donoghue \n---\n src/ipa/simple/algorithms/lut.cpp | 70 ++++++++++++++++---------------\n 1 file changed, 37 insertions(+), 33 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 9aaab54f1..adf411768 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -56,32 +56,34 @@ void Lut::queueRequest(typename Module::Context &context,\n \n void Lut::updateGammaTable(IPAContext &context)\n {\n-\tauto &gammaTable = context.activeState.gamma.gammaTable;\n \tconst auto blackLevel = context.activeState.blc.level;\n-\tconst unsigned int blackIndex = blackLevel * gammaTable.size() / 256;\n \tconst auto contrast = context.activeState.knobs.contrast.value_or(1.0);\n \n-\tconst float divisor = gammaTable.size() - blackIndex - 1.0;\n-\tfor (unsigned int i = blackIndex; i < gammaTable.size(); i++) {\n-\t\tdouble normalized = (i - blackIndex) / divisor;\n-\t\t/* Convert 0..2 to 0..infinity; avoid actual inifinity at tan(pi/2) */\n-\t\tdouble contrastExp = tan(std::clamp(contrast * M_PI_4, 0.0, M_PI_2 - 0.00001));\n-\t\t/* Apply simple S-curve */\n-\t\tif (normalized < 0.5)\n-\t\t\tnormalized = 0.5 * std::pow(normalized / 0.5, contrastExp);\n-\t\telse\n-\t\t\tnormalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp);\n-\t\tgammaTable[i] = UINT8_MAX *\n-\t\t\t\tstd::pow(normalized, context.configuration.gamma);\n+\tif (!context.gpuIspEnabled) {\n+\t\tauto &gammaTable = context.activeState.gamma.gammaTable;\n+\t\tconst unsigned int blackIndex = blackLevel * gammaTable.size() / 256;\n+\t\tconst float divisor = gammaTable.size() - blackIndex - 1.0;\n+\t\tfor (unsigned int i = blackIndex; i < gammaTable.size(); i++) {\n+\t\t\tdouble normalized = (i - blackIndex) / divisor;\n+\t\t\t/* Convert 0..2 to 0..infinity; avoid actual inifinity at tan(pi/2) */\n+\t\t\tdouble contrastExp = tan(std::clamp(contrast * M_PI_4, 0.0, M_PI_2 - 0.00001));\n+\t\t\t/* Apply simple S-curve */\n+\t\t\tif (normalized < 0.5)\n+\t\t\t\tnormalized = 0.5 * std::pow(normalized / 0.5, contrastExp);\n+\t\t\telse\n+\t\t\t\tnormalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp);\n+\t\t\tgammaTable[i] = UINT8_MAX *\n+\t\t\t\t\tstd::pow(normalized, context.configuration.gamma);\n+\t\t}\n+\t\t/*\n+\t\t * Due to CCM operations, the table lookup may reach indices below the black\n+\t\t * level. Let's set the table values below black level to the minimum\n+\t\t * non-black value to prevent problems when the minimum value is\n+\t\t * significantly non-zero (for example, when the image should be all grey).\n+\t\t */\n+\t\tstd::fill(gammaTable.begin(), gammaTable.begin() + blackIndex,\n+\t\t\t gammaTable[blackIndex]);\n \t}\n-\t/*\n-\t * Due to CCM operations, the table lookup may reach indices below the black\n-\t * level. Let's set the table values below black level to the minimum\n-\t * non-black value to prevent problems when the minimum value is\n-\t * significantly non-zero (for example, when the image should be all grey).\n-\t */\n-\tstd::fill(gammaTable.begin(), gammaTable.begin() + blackIndex,\n-\t\t gammaTable[blackIndex]);\n \n \tcontext.activeState.gamma.blackLevel = blackLevel;\n \tcontext.activeState.gamma.contrast = contrast;\n@@ -134,17 +136,19 @@ void Lut::prepare(IPAContext &context,\n \t\tauto &green = params->greenCcm;\n \t\tauto &blue = params->blueCcm;\n \t\tparams->ccm = ccm;\n-\t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n-\t\t\tred[i].r = ccmValue(i, ccm[0][0]);\n-\t\t\tred[i].g = ccmValue(i, ccm[1][0]);\n-\t\t\tred[i].b = ccmValue(i, ccm[2][0]);\n-\t\t\tgreen[i].r = ccmValue(i, ccm[0][1]);\n-\t\t\tgreen[i].g = ccmValue(i, ccm[1][1]);\n-\t\t\tgreen[i].b = ccmValue(i, ccm[2][1]);\n-\t\t\tblue[i].r = ccmValue(i, ccm[0][2]);\n-\t\t\tblue[i].g = ccmValue(i, ccm[1][2]);\n-\t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n-\t\t\tparams->gammaLut[i] = gammaTable[i / div];\n+\t\tif (!context.gpuIspEnabled) {\n+\t\t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n+\t\t\t\tred[i].r = ccmValue(i, ccm[0][0]);\n+\t\t\t\tred[i].g = ccmValue(i, ccm[1][0]);\n+\t\t\t\tred[i].b = ccmValue(i, ccm[2][0]);\n+\t\t\t\tgreen[i].r = ccmValue(i, ccm[0][1]);\n+\t\t\t\tgreen[i].g = ccmValue(i, ccm[1][1]);\n+\t\t\t\tgreen[i].b = ccmValue(i, ccm[2][1]);\n+\t\t\t\tblue[i].r = ccmValue(i, ccm[0][2]);\n+\t\t\t\tblue[i].g = ccmValue(i, ccm[1][2]);\n+\t\t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n+\t\t\t\tparams->gammaLut[i] = gammaTable[i / div];\n+\t\t\t}\n \t\t}\n \t}\n \n","prefixes":["v7","24/26"]}