Patch Detail
Show a patch.
GET /api/patches/25597/?format=api
{ "id": 25597, "url": "https://patchwork.libcamera.org/api/patches/25597/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25597/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20251217100138.82525-25-bryan.odonoghue@linaro.org>", "date": "2025-12-17T10:01:36", "name": "[v9,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/people/175/?format=api", "name": "Bryan O'Donoghue", "email": "bryan.odonoghue@linaro.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25597/mbox/", "series": [ { "id": 5669, "url": "https://patchwork.libcamera.org/api/series/5669/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5669", "date": "2025-12-17T10:01:12", "name": "Add GLES 2.0 GPUISP to libcamera", "version": 9, "mbox": "https://patchwork.libcamera.org/series/5669/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25597/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25597/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 B0EA6C32F3\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 17 Dec 2025 10:02:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1801461F57;\n\tWed, 17 Dec 2025 11:02:29 +0100 (CET)", "from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B0F3361F3E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 17 Dec 2025 11:02:12 +0100 (CET)", "by mail-wm1-x32d.google.com with SMTP id\n\t5b1f17b1804b1-47774d3536dso3952965e9.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 17 Dec 2025 02:02:12 -0800 (PST)", "from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-47bdc1583fbsm32292585e9.0.2025.12.17.02.02.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 17 Dec 2025 02:02:11 -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=\"BMQhyfA5\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1765965732; x=1766570532;\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=BMQhyfA5VEFVSeASPLCTfSLHdNy2VOrayMuzyI0xwbsaR6s4y95mfKEY5dvmL4PkgE\n\tVAejpWlj1uT2t+hU+8hGJgb5IHSz0/dFb42HqnpKnxPy08twN0P+GWwXd2U+x/zftZyR\n\tfF/4WIbDXpIjSwwWSS0I4GyUbABYuNZR8YqJyCtnsJkiuhH/bt+yWjGsiQDLhpi6jVTx\n\tSjjwZfU3Rn9awgmmJMcT3Yg6wSG+1TPpI3SoCpZJhA2e2dr7tNgivvagIhc0qHFoqgYa\n\tk8kjKBNYJidroYO9XCNu5JyTnEESqR7M1Ae7ofhZppPf9Nu3XFgbsT2Vw/5ZO2UtgU7u\n\tblNQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1765965732; x=1766570532;\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=a6Ktby3CntsJUu8KJZJOHsC9NjfiYLZKtJAB45Qc8irNFQl88LUAEYt7dCJhBYHitS\n\tZiayJYLVOwnsP5QBzj9KkOmP2u+sw3ISxjh5gnPA681HMzJDl5u5CDIqkq4xclcgpwBs\n\ttWxyK+av005Sp+zgqxs1YU4tZqvgaxo6gIvMfMhHkazOEA+rSl87fjo4HQEnVKc7/UC5\n\tmqctMIuuoIT4ju7bPenoH7b9I+nqIf0Y1SZNmTATYO6xr4CwpKF57951AJDl9gKtRhSu\n\tEF0bV0KMicPvrzcPibrL1fcqhViV7kYY41llTuvU5ouZt0PfqueitDiIFPV0hSgSvso5\n\tz0yw==", "X-Gm-Message-State": "AOJu0YzV7cey+yCxO6Kf3oWuCFBVg3PkWjvK/0ZM4ntgqOiNvqcUMYvH\n\tJJ5+WHY/D+N1YmSuxiOiKrpx68dQpkTCUJZdYwcD0wRZKuNTE0yZ8PzVA9tA00GoHvZNXu3emK6\n\tmP93x", "X-Gm-Gg": "AY/fxX4cWXXYZ2inMlNfEXsrYA3+ZZM3UsTLYLekXuAUusQbOi1YldwR7HnI2gFFiyA\n\t7VUMxzTqj5GQSUw7OviDqFJJBisyAvcIdMVafAV2xO+5ZMjOmAZlvf6NRANeeOsWKwKWmxTm2l0\n\td0lYCCcIu3rv6Deh/B/2aAQ4q2T/nxP7/KxPRpaOnj0QOae9/1tader1q880yDgwKFKVFyhX2r3\n\tMFXp9Zy8kM2vjyfrmO9G5TvvUZc2uYJ5Wp38rF9aWD17H8I5CypzTGlpeS0Fhbdb3gUBqOJ0Nfq\n\tEKlUHidT4cBieritgPQSba6HkG+OPxcNv5DVALihrQRnC0NBN/oRuy8k/42l+CwVO4ceDqhafbE\n\tYunRR/Hu07IEZjvO7gViaWmn2Ke/0dcDwO7lUI+K/493itrsV/7v8VbjO6NmHHGc51+uijPcx+V\n\t3SZBeueTfuEZReL9UOnZW3oKfenA87Xbi2S3ztoeD3SErAeN6Ybs36OQgaBWaVhsJve48=", "X-Google-Smtp-Source": "AGHT+IGmxqKxLY4833F+Cuxw21nkY+BTpI/aTuShjG3Ea8giSSlaKckFVxS1DkneA3EnVj9iMd8Egw==", "X-Received": "by 2002:a05:600c:4e91:b0:475:ddad:c3a9 with SMTP id\n\t5b1f17b1804b1-47a8f2c2f62mr177622105e9.13.1765965731920; \n\tWed, 17 Dec 2025 02:02:11 -0800 (PST)", "From": "Bryan O'Donoghue <bryan.odonoghue@linaro.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "pavel@ucw.cz, Bryan O'Donoghue <bryan.odonoghue@linaro.org>,\n\tMilan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH v9 24/26] libcamera: software_isp: lut: Skip calculation\n\tlookup tables if gpuIspEnabled is true", "Date": "Wed, 17 Dec 2025 10:01:36 +0000", "Message-ID": "<20251217100138.82525-25-bryan.odonoghue@linaro.org>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20251217100138.82525-1-bryan.odonoghue@linaro.org>", "References": "<20251217100138.82525-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <mzamazal@redhat.com>\nSigned-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\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": [ "v9", "24/26" ] }