From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f67.google.com (mail-dl1-f67.google.com [74.125.82.67]) (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 BA6703BED61 for ; Thu, 4 Jun 2026 05:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.67 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780549510; cv=none; b=gud0vISlZic318DnjCviZnKJ7K+D9wBKYbEh8uNNvvsqT1TF6OeFdKDPhjbbjkWOJXktVZgOQCQM9PIzC8wnSrOUcmz6Lzm98fWaGmbLWELRXyLtjEduwUGIDi3ZAdWokXk0IVudUnv6gmyZy/jZ6++9ey7VLK469aaze4SYi2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780549510; c=relaxed/simple; bh=dnE8BdEu8D6gluVtEh00lzqRho0kzmkfQZU+gpm7No8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=G8tu5Vl7Nk8sp5jcbv51hohBwYaB61QNDG4ZJYUAGW5T2T6518iFZtCSQGUC/TjYQRgdXCD08XagfHPFkklxu+py/K197+i/Ldz31XMYDsIMzr98f+xG6x+zaGaYAlhfB6YeqWlV8ilaEbpuZe2bUPkulCJee6oLs4g5qoKnRI4= 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=dQFRWz5L; arc=none smtp.client-ip=74.125.82.67 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="dQFRWz5L" Received: by mail-dl1-f67.google.com with SMTP id a92af1059eb24-137f3cb3f46so883347c88.0 for ; Wed, 03 Jun 2026 22:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780549508; x=1781154308; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=06B6FokD6dDE8gCXlJmq6IxYzkOZd47THRDOzv4mUrA=; b=dQFRWz5LmH4WzaegObCPZpJL4piG+gjLij9VabRjLp7CbIjow2VByaj/nUJkinqTpe 3FB6D9ufT2pUv4KZ1Sxlq1X4Rv4kiiD9Y7Xz17b58N0JPTIUJJc54IIc/EmJJNcy37hw Yq0RRbgFHhi1EBpxz/LnOsBSuQT8gDjiljXE/qb08Vir0UQwY7T4K7J3v3Ayv/05ZreK kyGPdaJO9sIAzC7IknWFOM1BGB6jhvf8OxfvLMv/DPtPo1ZVC0iSBMzsgEySsoQF3PcK quR/LRfG/LgAJqmHkC4JcLeZ6U3S8zWF0o3N+qF8lkpJJdWguHSYQVrWknOnkMwE28ar cMIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780549508; x=1781154308; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=06B6FokD6dDE8gCXlJmq6IxYzkOZd47THRDOzv4mUrA=; b=Maw7VlF/woghTWixVsDXZN4tT1vY9dlgCPO5aKPNp+6YSAVKfX3YzvtenJUFBrHjT2 NVJbzQw3AOSuszkGPxaxmydcvZ3j5AvUUQhH4b0qR9lannlbEfW+RtbS2k4v6Fxn/d8i iCkGVaR+SXMq/lUJThdbMO5eanxb8sqap4+KE2OvwRcgCzxexWfZOMuCXizuaodA3m8U f6ClKu+xE8oLs+MX8xaEXLGwCGnkGDHjduq9QMb6kgq3Z6LndqvSRu4c1fMXVemM14lP SxjKjuSfVnl8Tgic7RwUUcOWxOGp233oW2XdvtW86MyIMAR37HyYVjXdd5hinfoeZwPr izhQ== X-Forwarded-Encrypted: i=1; AFNElJ8sQQThRKrw0DoUamQOtwHqAdrsSxmG+27JDA9zOxfhSkHBZZQOHC+6ZTJasFGQQwkOxeTtItH+hIV0qr0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8uCx2vO7BpHge1FxVufkjW4qKslC3aTJG3veHBkzSNHpLXCJt p4MlOgXGlZre32MtR6ZNvzjxGHTkIJsqj8TSt+qfrs00AiMLKTsp903GOcAcmkQk X-Gm-Gg: Acq92OHDj7SB3fuTvw/HBkdpzZ4HMmGJqEzcYP7LxwX5zN5r3XbQ2s9+VwbTv+Im/DR hR0t8FSFJN3iL0Xss6WMDPJfC6x3sF54uyKowvB+/YwSNe14J9q9f8WHeWaxuDdSa5jG1XidxgG sizeFP2wNvgge9444IrohFbSPKlzqLtAZiyrsfY69Ac8TVHD/IRWE/iG6gqHSvHtehnHVp87Hw8 z5+Tb0UfwE/BX4kbHgzzikN/e8RtfwqK0JG/oahERpNKRADnmWi2tJNhrF197LlUxs0wUp4fS12 eJb+7d4zM1DW/zmoaGDLbvST7eZpaYx+0QjL4uBI5ObIsvkmraZba0CBunliQH/K0EnmEH/JNQ/ 9SCt4xLLMaRqE98JF7TlYBWrsA/lYzj94H9ymjq1YVzgYWocdIwY1A8KkMLXTCdAX6pFLXIpKb7 Ji+nANSIBEv+qKjwr3+0JPOqxFGuKPq2g19vN3PCMIjnDQ5oX6jz1qpS97o8p6ybaW7w== X-Received: by 2002:a05:7022:43a8:b0:137:f995:df25 with SMTP id a92af1059eb24-137f9a52465mr2528386c88.13.1780549507751; Wed, 03 Jun 2026 22:05:07 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-137f5550bcdsm3414240c88.14.2026.06.03.22.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 22:05:07 -0700 (PDT) From: Hungyu Lin To: vikash.garodia@oss.qualcomm.com Cc: dikshita.agarwal@oss.qualcomm.com, abhinav.kumar@linux.dev, bod@kernel.org, mchehab@kernel.org, stefan.schmidt@linaro.org, hverkuil@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH v2] media: qcom: iris: handle runtime PM resume failure in core deinit Date: Thu, 4 Jun 2026 05:04:51 +0000 Message-Id: <20260604050451.41583-1-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Check the return value of pm_runtime_resume_and_get() in iris_core_deinit(). If runtime PM resume fails, skip hardware power-off operations but still perform software teardown and state transition. Also skip the corresponding pm_runtime_put_sync() call to avoid unbalanced runtime PM references. Fixes: bb8a95aa038e ("media: iris: implement power management") Signed-off-by: Hungyu Lin --- Changes in v2: - Keep software teardown and state transition when runtime PM resume fails - Skip only hardware power-off operations and pm_runtime_put_sync() drivers/media/platform/qcom/iris/iris_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_core.c b/drivers/media/platform/qcom/iris/iris_core.c index dbaac01eb15a..bf3c7f722490 100644 --- a/drivers/media/platform/qcom/iris/iris_core.c +++ b/drivers/media/platform/qcom/iris/iris_core.c @@ -12,18 +12,24 @@ void iris_core_deinit(struct iris_core *core) { - pm_runtime_resume_and_get(core->dev); + int ret; + + ret = pm_runtime_resume_and_get(core->dev); mutex_lock(&core->lock); if (core->state != IRIS_CORE_DEINIT) { iris_fw_unload(core); - iris_vpu_power_off(core); + + if (!ret) + iris_vpu_power_off(core); + iris_hfi_queues_deinit(core); core->state = IRIS_CORE_DEINIT; } mutex_unlock(&core->lock); - pm_runtime_put_sync(core->dev); + if (!ret) + pm_runtime_put_sync(core->dev); } static int iris_wait_for_system_response(struct iris_core *core) -- 2.34.1