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 070373A7189 for ; Mon, 8 Jun 2026 08:17:52 +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=1780906674; cv=none; b=TFBV8soBsJ4w7m+gLiF2nVacUrkgf2bb7pMbi2L1tW0KMSTW4I3Ulq2DSJTKu1NmOfBSLDXzQJphMeVkqKbnx/nPYrbNqM7c3+Ekq6ZA2mgVw+6xzOIZKgm3c5ugvE2zOpgTwXEIqCyU8QoHjjr3WZ3fAATsdl1AqBdVWKnGPGw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780906674; c=relaxed/simple; bh=40ZxnyrUaAHdcI+eTW6aNV5PfIertlPm7WF8EsDZzB8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g4qgwg9VH+uJwz9oYLwcF55MY/7n7QHgz4Vxs5lA4qLHi7MSZWZ1AZoU3e/3GEdbMokQO9JYW6R2ET7EHOEEi9H8E3iVf4pWyemn6KzhvMA9GMRUZXXmMQy6q6yTLC24Zv8+yfa/IgFQNodutvU6XPOVTs9jFZ/KrGOyRfIgNAI= 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=Y2ssxnLf; 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="Y2ssxnLf" Received: by mail-dl1-f68.google.com with SMTP id a92af1059eb24-1370417c01cso5256009c88.1 for ; Mon, 08 Jun 2026 01:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780906672; x=1781511472; 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=12KJd8jmEDNc3peQBhWeVZHFv/dyQimGIps+u7jJr2M=; b=Y2ssxnLfDWJhLo6docOppjn2apJEyLp+mJOeh/XcEOBlSKnZ/Hy2LYtSik6zNlBfer R1Xxm86NG37KKKya1g5MZCqao0p49ZzMSxQUP7VsAM4JIHrPebd2XBkdcxKBA7n7LlVU d01YllFyKazgebpmSovIM2Nl6ZyNUPmvgimqyFYfoAnCKjCXVkdkbOQy2G+OE7d0mql8 OrBOdVGPgxsa5TRFHQOvEzo4fG9AXCZajoLcKMb0fqhT04Zd41ivSMjgK3DLE7+/kR4d 31luDdHY0sBOuJ+xHVEmzpuTWhwleLCVq+29kMfXbdFkIJR1257XTVOzzHCA4lo50xIM uogQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780906672; x=1781511472; 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=12KJd8jmEDNc3peQBhWeVZHFv/dyQimGIps+u7jJr2M=; b=hwPJlCVIYD3s97sE7+jidYytBO8j4qxOIfetvIo5cxlzsiHUn787UTyzAWIfx/nISB DJcBvpT/P67DaSSHRD5P8QqGNcuGk16X5BdkmzovdsTh/V06yvz3fUx4lFvpb32pYdC+ bauv3b/szsne6SwiHbyEN61kDUOHEMelzl8CrGf71IHm6AlMmmcXdo44Ko5cD6C/a+Zd eZZZh9p92SeFbCXM7uu/jxFV67+vt43MBnUhN0sLsQJwZkU6UBvz78pCTQLJQ0hP1tjc Hm/q17ELbkf7P4eubcd0NqMFX6BLqsYCFvZZPIOh+cIhPMFuna0KEkyE6/WBEzL7JD5+ ZdJA== X-Forwarded-Encrypted: i=1; AFNElJ/ZTEI+D54XDvX7cLmcz87tGW3Khisjj+larkGPdlfTuoSQIJ2w19VwfsTy02l2Uc+FHDJ9icPUfnbNDoE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzu96fGCLEbJ/HvPMrjHiF86SuajOET6FfR+LCj6R50tuoYclhp RFQJ6c1X/aivgkHqi08EoejKvmUWdMFEtjZb5gB8O9P86pb//PjFGQ81 X-Gm-Gg: Acq92OEs8jkxRqbcTKg5jzBm8uJPL4GoKnaferYUabUO/Zi1Q8ZS1mIO8gWYf93de0V w9oi63VeGuvKSFa/1HTzFHseJbKY/8woi1QKPr/LkmC6avFj4HxERH/7PpOR+5xgABQyQUY5lzj qAOnhlZwaPDFn+sOvROpfX/YKNhUNII/JJqhZpc5HWwL1+CwW8olDs0sQv++4P7YB0yiQB4rLpj PXpEjI1FHAS/74fBYcjoWQDGliCP7CocuGS9e4g7eIjqHUuJcesqSoR9fX6hUNryCPdsFJK4P2P 4wNVmfcf60vApkzQV2jJJWL1UahbHlY3J6rDLC8NYvGJrw8a711DNZp9s4zYzvx5CWPtGIIG1Ic nzMviIz39p3iu1J8Pszd9BeD5h7C1OD8DPatnBDaN6qCkK5AVEnQiQnm8kFLZyN5ACKB9TynZk3 XqhQTM+QLxiwfM3DIhj1VkZ6wluzzAV7FtWXWAJh3z+Rzq6t+J+f442ipzchvhbC63CA== X-Received: by 2002:a05:7022:98e:b0:136:b370:64c5 with SMTP id a92af1059eb24-138066fdb24mr6558060c88.30.1780906672171; Mon, 08 Jun 2026 01:17:52 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-138063de4a5sm7678245c88.13.2026.06.08.01.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 01:17:51 -0700 (PDT) From: Hungyu Lin To: vikash.garodia@oss.qualcomm.com, dikshita.agarwal@oss.qualcomm.com Cc: abhinav.kumar@linux.dev, bod@kernel.org, mchehab@kernel.org, dmitry.baryshkov@oss.qualcomm.com, konrad.dybcio@oss.qualcomm.com, busanna.reddy@oss.qualcomm.com, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH v5 2/2] media: qcom: iris: rollback OPP vote on PM resume failure Date: Mon, 8 Jun 2026 08:17:21 +0000 Message-Id: <20260608081721.82846-3-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260608081721.82846-1-dennylin0707@gmail.com> References: <20260608081721.82846-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 --- drivers/media/platform/qcom/iris/iris_resources.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c index 6d3339423eec..3e18c6998f92 100644 --- a/drivers/media/platform/qcom/iris/iris_resources.c +++ b/drivers/media/platform/qcom/iris/iris_resources.c @@ -78,7 +78,16 @@ int iris_enable_power_domains(struct iris_core *core, struct device *pd_dev) if (ret) return ret; - return pm_runtime_resume_and_get(pd_dev); + ret = pm_runtime_resume_and_get(pd_dev); + if (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