From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 D8FA934EF0E for ; Sat, 18 Jul 2026 13:03:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784379792; cv=none; b=j+HluVxlOnKxFEqhGA194uG7GbCohBzGjKociK0K5ia6u4S5+3wkBjyvUxS16mjoE4mQWyDkXMkTqiwp/PV1y6CdfaoEKMU64AOUrqt26wHkdq6IlH2eb5rvTxmZXDvs4CsK8VKpEZAasohkwPsvvplPjR8rnNgYlqnZfWavjtk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784379792; c=relaxed/simple; bh=HlHEfXFZJ5xtln/j37UOuB0TCVYBSKyfl8up/yiI9+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m8m+vrmk5S0G9Xpo/teZA1M/E+g9r2Bd6gijojoGsgYC29GvgXrExRF82iczDQ9UK0O3z4csiN3D6BWks6sSPv8YZHEWpEobiGzYYmaVMO2nIOPgkv7M9oAWCIQ7ZrHU11thMJBanfB3qV3DerYNPWZ6gWzUIgCn2+wjMaCk1P4= 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=So0S9W0U; arc=none smtp.client-ip=209.85.214.181 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="So0S9W0U" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2caea3f742bso106621435ad.0 for ; Sat, 18 Jul 2026 06:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784379789; x=1784984589; 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:content-type; bh=jPoS/KPRuLJigSPtx3g2dwPFdKf+p/6hoW4Ckw2zIVg=; b=So0S9W0Uev/I3CNjPIlevzhMbRGGW5107rKfsN+lKn27Vwo1wNsNZ0i7psVnW5arRY OONwn81DCPmU6gTvWH0zJlfLd5mYPznsGjZMlZ0iPQhtXRYtl1qERUwW8d0yA97EXaAL 0oALfgwfcFlLjYle/V0qqFS3+y9CEBDlcU9wFEB40jVq1Fp6/B3LZ9fPNoowByElW6n+ ywGRISeybHTzRJ7PT+9edrwUDup2QfPIdqWjybtXgt3U8eSbMzSums1BstuBhtg3ckmb klUSG0Q/N4BSddhuu0qgI7gP5jgTD8tWMuU0Bfo1YgdL6avJRedvaRrCp01/dfz2BFQe mLAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784379789; x=1784984589; 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:content-type; bh=jPoS/KPRuLJigSPtx3g2dwPFdKf+p/6hoW4Ckw2zIVg=; b=kT2x6U0/zJ7QNWEGw5cOGBNOenso6SbHkgy24V48ZUVEnZuEOXN2Pq6G7wzYCmkK2p k/WiodsvlnOfEYbf6ISgQ9xQ6JumQF6HlKRSpUW1Uq7c2Ig2klLCs4zHhIgBeHzjnH0C w3F/KWyoOuHpaWjygZRuMz0HytcPFQmFkNzWfpgLn4jzWSyxVxepzmNujxFMzmrD+KEz uFId7mpBd0Otq2L8NlXCTxFEx6rcXTxfSW5uT1Rsifqp51/iZkAF6FpvJmQobLvbn9Zi 5V4usSeULDNqkry8akIOcaDu3Xa3265WYxpCPvLwTSGx4tOB9+EmXxPca1ULhHw1SpiM EadQ== X-Forwarded-Encrypted: i=1; AHgh+RpPxeJi+C7H3WDFF2SFk/FDr/W7IqUEyF33mX/c0ltg/CLjmjrmCQBlJVd94hC3dgRmzRCAzE6/8hFTZqQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywdo3margVmQDN+a6BuouyWyYHlUhUNTrjObXiocjKUBPS8pNyA Q+ODRNnGMYameyaOuSQrXlpOIS/6ieLC8qM8yD+tci1bi8lWI9dELiaP X-Gm-Gg: AfdE7ckPJa52TwiYrEJ6TwKdXAr9sR3ARNDx3gquITQ0pgk6o7oGIKBPJIQGdVH4Bzg HKR5/JPvbBqJOJzh2JmCYk58L3doI8J/rQ/6X3U7gByxz74xuCmkueMUV8m8zmdr0K1X0cj/6Xc AAARBCOVL0aRAnBRxUlsi4uTvRdu5BBr0S1IyjM6CcNZvqL9S2iJ85wHh3QvL1KgDH8FFd7YdRw 9FKTS5jhj94kfJyxtgvKPJYfCtOJMuHbjjoDJ96RB+OfsqtxyOVwR7dFD3qWseoqCufUxkQywm2 /QO6f5zbQJCn6ZcAGxgJy1VWCep2iWD2ROfzAKa+PX8ocRhb3krqKIxmcg9uDXBrZj8uCBL/7PZ CU0ZHZIkcjecf54Mq8Xu2ohzLcHtc3O7/mJFbYur5GJoF2l9kxnKnKetfkCK9S8yGw26rU5k= X-Received: by 2002:a17:90b:2f85:b0:38e:1497:af5b with SMTP id 98e67ed59e1d1-38e4b3e1015mr6893997a91.1.1784379788951; Sat, 18 Jul 2026 06:03:08 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e4aff383dsm2766845a91.8.2026.07.18.06.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 06:03:08 -0700 (PDT) From: Guangshuo Li To: Nas Chung , Jackson Lee , Mauro Carvalho Chehab , Nicolas Dufresne , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH v2 2/2] media: chips-media: wave5: Check decoder runtime resume errors Date: Sat, 18 Jul 2026 21:00:37 +0800 Message-ID: <20260718130037.3306626-3-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260718130037.3306626-1-lgs201920130244@gmail.com> References: <20260718130037.3306626-1-lgs201920130244@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 The decoder start_streaming, stop_streaming and device_run callbacks resume the VPU before accessing hardware, but do not check the return value from pm_runtime_resume_and_get(). If runtime resume fails, continuing can access the VPU while it remains suspended. Since pm_runtime_resume_and_get() does not retain a runtime PM usage reference on failure, the later unconditional pm_runtime_put_autosuspend() can also drop an unmatched reference. Check the return value in all three callbacks. Return queued buffers as required by vb2 when start_streaming fails, clean up buffers without touching hardware when stop_streaming fails, and finish the current mem2mem job when device_run cannot resume. Only call pm_runtime_put_autosuspend() after a successful runtime resume. Fixes: 2092b3833487 ("media: chips-media: wave5: Support runtime suspend/resume") Signed-off-by: Guangshuo Li --- .../chips-media/wave5/wave5-vpu-dec.c | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index 03d108b808ba..bb59bc962603 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -1380,7 +1380,11 @@ static int wave5_vpu_dec_start_streaming(struct vb2_queue *q, unsigned int count int ret = 0; dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); - pm_runtime_resume_and_get(inst->dev->dev); + ret = pm_runtime_resume_and_get(inst->dev->dev); + if (ret < 0) { + wave5_return_bufs(q, VB2_BUF_STATE_QUEUED); + return ret; + } v4l2_m2m_update_start_streaming_state(m2m_ctx, q); @@ -1544,9 +1548,29 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q) struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx; bool check_cmd = TRUE; + int ret; dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); - pm_runtime_resume_and_get(inst->dev->dev); + ret = pm_runtime_resume_and_get(inst->dev->dev); + if (ret < 0) { + struct vpu_src_buffer *vpu_buf; + + v4l2_m2m_update_stop_streaming_state(m2m_ctx, q); + + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + inst->retry = false; + inst->queuing_num = 0; + while ((vpu_buf = inst_src_buf_remove(inst)) != NULL) + ; + inst->eos = false; + } + + wave5_return_bufs(q, VB2_BUF_STATE_ERROR); + inst->empty_queue = false; + inst->sent_eos = false; + return; + } + inst->empty_queue = true; while (check_cmd) { struct queue_status_info q_status; @@ -1659,7 +1683,13 @@ static void wave5_vpu_dec_device_run(void *priv) int ret = 0; dev_dbg(inst->dev->dev, "%s: Fill the ring buffer with new bitstream data", __func__); - pm_runtime_resume_and_get(inst->dev->dev); + + ret = pm_runtime_resume_and_get(inst->dev->dev); + if (ret < 0) { + v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); + return; + } + if (!inst->retry) { ret = fill_ringbuffer(inst); if (ret < 0) { -- 2.43.0