From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f68.google.com (mail-dl1-f68.google.com [74.125.82.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C99B337688 for ; Sun, 7 Jun 2026 23:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780874947; cv=none; b=tdOQeYCQjlaIqTEwJsBTocyMmBXUbG+9j6UTVM9eCsejOyNmCa3XdlhrkDwB8K5Lax6zNZvafZ2Uf7YSjKMCA5aAOz4KFABgByNkOw/wWfOBdXM9/jhU9GkRpLecHSDb8FGTetFVBNgNvl++V1gbc2baL7yuwR947hQ3NWn3N9s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780874947; c=relaxed/simple; bh=Qdn7lfFv1Qy9y7QLkJ6IB5ugP3HJ7KhQ77rqkSIgdAU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=huf7NgOnHSYH+Sne8L1YxUr/xiaARibR4fWMGZiIh2fOnVrAiD05q9VAxMfoO90/WtD6s201ewNhCE5pr2nSQd3BGOnlp/NABXsFDUqbFHqpWm6BGAXKPNKLRMjHM3GPzrq+oWSjeCYSIQXFI3RP1eQV2d+/il2jPNoHRhWdON4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mmf+b4bb; arc=none smtp.client-ip=74.125.82.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mmf+b4bb" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-1363e78746eso3884285c88.1 for ; Sun, 07 Jun 2026 16:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780874945; x=1781479745; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gb7ZJjfKb99h5+YHieJkW6NM4/xOtMM48PIruUZX4LI=; b=mmf+b4bbR1lSOK0qHt5r4p5O6oABcLgznR7CBJHsDVo6vU+PxV+/mHpOYURDarYgEr 8ujCQfsayAZaXTa/sItNdP2Y89EJFvtvwC+TSmONcxDYfqNAG1DBW3U8jl6UavY/5if6 KWMBZrx5sy5YXomT5FtNkcyliAcNoIl8sTT7xyw6f/mbUvtguBiythQiMvQvgxRGebnO pQC2E3iZwODYpe/YG79S6RWoK7sRPcmW6fUpU0mnQoUczsrKx5bKdoHMH8/euYSMrjga gcaYEEp4CZnrNwzn+93pv5jN+zhfFD7/CMrEeI7HnYthCPTJFKRDheuG8sbKcjXArysV k0Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780874945; x=1781479745; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gb7ZJjfKb99h5+YHieJkW6NM4/xOtMM48PIruUZX4LI=; b=pZzvCLMeu3HFQL7Cch/zjHNc23U3w2uVBWYr+aAzd1ABwrKcxDoCK6olxt/AGssnnm yNH2kqzMXHfrWAHv9BI4dDzXxRpldw1aLi/iGKfD16nhJEVRsZsXToude9ctbhfy0Lok YAzE7kXaUTab/yh6J4qgWgL3UAPTMtp9KegJSOyES12WmQddJk4/3IMGTwHIv4cU2WKp xQ5FqSLcCsE6Uev/VQIu/JIfGfqRkBxSMTg7YnUxwFDFJT2ppqhDjYgKHF3eZjSYumMj 26dokhUBldyCiAEUozbk4OVgXbxDJYBJEsPM5L7fzm6fsznsma9yNG7hBzVIApqarn5d LqsQ== X-Forwarded-Encrypted: i=1; AFNElJ85U4u9Nak8VnISDptJq8VwAxHereAAuiuzDvJAl4XFC3nE17raCKycyyG/4brxnmf9EdFtJ1/FwVuNN6g=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1G02gPdPuw4AXYF3U18G53HFDaURoLchdmWkWxjDChHJly+PX 5waUsdqVGFd3ehd/1cprv1lH7dire+ISwF7Y+fgnWJgfJt7lDKMKdqD2 X-Gm-Gg: Acq92OFL2rj5qf4V6U8PLYMuRSBjCXPChU506WMSkH7zHOde7X23YNUdA3m1ksLJ/gy HgIktai9qJ1g97nGu1bt76CkYj1G/M0GCBib7k+Qy34zw+eldcMAQiMOWG/zIfFOT47YnsT7UtD YwYGPVo4anv3bXHwoiH6ZB+jbciY9KUi31uWElRRUiYPf/EKGSZtMW7FQVzF73+RbdDcILMZ+FW xPbb/dvszcXc7usot0fwhn4u0bjQ6TURl9RNHVIHqdgFEdpnw2IfYgSXF678Hwdjg/75pSHPHXV G+cM6SVOwdwuprB4suoAVRmO1ZqFi6crifhrQwsrjd0JiU1sUMMuiCDQVyG3pCsZpABjb13GPfQ D0P2yfjQC1oa6sALey8Mp5gHt82m/C0R6LCNzr9Vf23vED97/w1idYw2gGrtMgQyrRVZbtoI/W3 Ojgy0F/RWNoqYkU6RRo52iRyiTBd1b/8j1/LMUD7/H2nGJAz8Iew+EIALc9xXHaBNk+A== X-Received: by 2002:a05:7022:6899:b0:137:edfa:6f34 with SMTP id a92af1059eb24-138066834b9mr6466787c88.1.1780874945236; Sun, 07 Jun 2026 16:29:05 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-137f5539035sm11324554c88.11.2026.06.07.16.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 16:29:04 -0700 (PDT) From: Hungyu Lin To: linux-media@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, vikash.garodia@oss.qualcomm.com, abhinav.kumar@linux.dev, bod@kernel.org, mchehab@kernel.org, hverkuil@kernel.org, stefan.schmidt@linaro.org, Hungyu Lin Subject: [PATCH v4 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Date: Sun, 7 Jun 2026 23:28:41 +0000 Message-Id: <20260607232841.79275-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260607232841.79275-1-dennylin0707@gmail.com> References: <20260607232841.79275-1-dennylin0707@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rollback the maximum OPP vote when pm_runtime_resume_and_get() fails in iris_enable_power_domains(). Use a standard rollback path to release the OPP vote when power domain enablement does not complete successfully. Fixes: bb8a95aa038e ("media: iris: implement power management") Signed-off-by: Hungyu Lin --- Changes in v4: - Addressed Dmitry Baryshkov's review comment. - Reworked the error handling path to use a standard goto-based rollback flow. - Roll back the OPP vote from a dedicated error label when pm_runtime_resume_and_get() fails. drivers/media/platform/qcom/iris/iris_resources.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c index f5e3341e1430..9059cbe8fe5f 100644 --- a/drivers/media/platform/qcom/iris/iris_resources.c +++ b/drivers/media/platform/qcom/iris/iris_resources.c @@ -80,9 +80,13 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev) ret = pm_runtime_resume_and_get(pd_dev); if (ret) - return ret; + goto err_opp; return 0; + +err_opp: + iris_opp_set_rate(core->dev, 0); + return ret; } int iris_disable_power_domains(struct iris_core *core, struct device *pd_dev) -- 2.34.1