{"id":25332,"url":"https://patchwork.libcamera.org/api/1.1/patches/25332/?format=json","web_url":"https://patchwork.libcamera.org/patch/25332/","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":"<20251202134544.662446-24-bryan.odonoghue@linaro.org>","date":"2025-12-02T13:45:43","name":"[v6,23/24] 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/25332/mbox/","series":[{"id":5631,"url":"https://patchwork.libcamera.org/api/1.1/series/5631/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5631","date":"2025-12-02T13:45:20","name":"Add GLES 2.0 GPUISP to libcamera","version":6,"mbox":"https://patchwork.libcamera.org/series/5631/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25332/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25332/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 C4EEAC3330\n\tfor ;\n\tTue, 2 Dec 2025 13:46:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2183860D36;\n\tTue, 2 Dec 2025 14:46:33 +0100 (CET)","from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n\t[IPv6:2a00:1450:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 35E7160F78\n\tfor ;\n\tTue, 2 Dec 2025 14:46:27 +0100 (CET)","by mail-wm1-x333.google.com with SMTP id\n\t5b1f17b1804b1-47778b23f64so32157985e9.0\n\tfor ;\n\tTue, 02 Dec 2025 05:46:27 -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-47926f0ec69sm19383375e9.1.2025.12.02.05.46.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 02 Dec 2025 05:46:24 -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=\"HmMP+mUF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1764683186; x=1765287986;\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=St8BDxwP4t/WaFpYmjnDvCofVLPqsqEHtlV+2cA2P1g=;\n\tb=HmMP+mUFEbYdy8cqPxMhNgAaxbz4F7hc7TEZqxY2HO7WL/4m2U4zeLKYayAzgtrIfn\n\tJ6RYFpde6jIA7GaW6FyNH3EYL9xGVlUcfW4UiIG3vpYZWw8BR4pE/qb/1OXT/FCPoouJ\n\t6Zn3CkRFyl/y7uwtRJmGxyA7r2BesQu4UXjfEg0Oc+JSeBqb1jlIipPQnU+omIUh61LS\n\tkl7G9C3OnbWTfEDVGOkhLPUJ3YzX6TmVeaXWmrzh6CYfRdauaIr0jAxvSdN79mPPLLhJ\n\tocjIlhqt3B6xiJ/sbHFeWTdPpDUNTF1TJtuXmLY3dBLjxLTXAKX2ZmwzzF677BjS82fc\n\tEw3A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1764683186; x=1765287986;\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=St8BDxwP4t/WaFpYmjnDvCofVLPqsqEHtlV+2cA2P1g=;\n\tb=kr66hEvqPPPgC8PcAJ7pJKSye6UoOwFw0mUsH1k/sQCGWCO+87OyKPSN0mjSwrx+Ij\n\toBymBIePGTt0unFb1Ho2vxCpsqmdOnh5gP4EBZbOPvFDruXo4j9+/2D//GWIPcr8eBd2\n\tc1yxWENPiiPmxKOj2xtezL96mmvHt42+Em4Fl+/bpdcEQh5nfaPcZffXpRAxQ+ONWe63\n\t/gldGZJlk8obRIDjmA6UpHrpYzeQI3JEbV9yCZzKrccrQ/PtZZmz/riTArVcAwTQjGwf\n\t/edV+lPaFxJ5dCrcHEgNllumj9Tyw4Xb9md23pialn1iLvnIGJi8s7y5VI+QC0zqxb+R\n\tir0Q==","X-Gm-Message-State":"AOJu0YzF08wC7H3uNjZTqJJS8RKUe2/bZU40mVH+fOaGvUTrdDqOK4n6\n\tATdWXuX1DjAXq8hFatN8jR2bqdg1RrcrG9nVrnC+N+wOlnmmwnircvz9eAnQNmVpJwkPgm2Or8g\n\t6v9ln","X-Gm-Gg":"ASbGncsb5TZKTaKzxvfLN2JRUtRjCCcBYGyMig6Pn/9tMPWYRBWL+hkQyj7MU4AOGOF\n\tgvOdrtLj3yQKcgwaJTcMx+TJTBgnTfPCjUURwxRDWgFNTOMtEuIYlk/G5zBi8J12DYc47OoibWs\n\tJNK5AeZBor+KGKKdl/rQVnzKJE0UQzJrMnCZXdUDNHEKPMdqOKUSTSXJUg0cCvO/E2gqgmvmc1e\n\ttvzACiAgOhl/PIoJ2xJrT+SNYvuvN+HPBjYl3IjHxjyhF1VC6hpyn4l8Y68K/fhHT4aR/XOO+Fv\n\tfKXXUEhOYCF0gl80SMQ0GBCcDDyvgIRKq3Kiagm1cW4Z/vSmrGuKiWqGXd15lYzw2bKKtlgyPcp\n\tshxjxMhd9cJaFfqcGpr5PorOdCWcBI2dOsQRKoETt3uymv34bi6p9q9SzB6INHrVNHdHV075Iut\n\tFilcAFntH5Lh8dKuWQVkCjAvcFJstdSHnmkQk7apvTDvbqa3apFVqNJSBnT30uYfbwFoY=","X-Google-Smtp-Source":"AGHT+IEfihEi2WV4Rb6i2UrinCmuqFEvrmQhplNCftWhO+XsEoKKHsNDhfMBK633eLOTzkFq3BOFtw==","X-Received":"by 2002:a05:600c:c492:b0:477:8985:4039 with SMTP id\n\t5b1f17b1804b1-477c1143024mr411348075e9.17.1764683185383; \n\tTue, 02 Dec 2025 05:46:25 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz,\n\tBryan O'Donoghue ","Subject":"[PATCH v6 23/24] libcamera: software_isp: lut: Skip calculation\n\tlookup tables if gpuIspEnabled is true.","Date":"Tue, 2 Dec 2025 13:45:43 +0000","Message-ID":"<20251202134544.662446-24-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20251202134544.662446-1-bryan.odonoghue@linaro.org>","References":"<20251202134544.662446-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\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 7f223e812..618219b17 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":["v6","23/24"]}