From nobody Thu Oct 9 10:14:25 2025 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCA3924110F; Thu, 19 Jun 2025 03:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750302726; cv=none; b=oWw3paQ8VG8+jOH1D2Api3FRBvs7PYwB4kPMqflYEnz5HH2wtBixGugKdeIUntJ3Pb4OCj0fjEOkE9pWM7MV6RTGqFXGoRQiqJJIIqrlycsIYOfeORoPqAOmEvsSOdAzJOSukwafwZbTRWBtoEps1SNs57TbuUV14UM9tNHmkiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750302726; c=relaxed/simple; bh=Opo7ilkRBOQRFZ+jcQUu8mWf5CBuQ8G864eVO+ghdAY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OaDctDzhbl7PyCvyiy5KgcgPq4ngfMSgUN2O/n0pL8S/Zl1ipie80GnCylMl0qmTo+DD8/jMn6bxeTqif4kgGlLa/g0BMc98Hcs3RomUPkfNkASsaviccLn7M9ukNKYqirjP5wmf23UUiFs1ifk2eaZ7DV46Iye32N0pjrLmK0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=pGhh+aIH; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="pGhh+aIH" X-UUID: 283495fa4cbb11f0b33aeb1e7f16c2b6-20250619 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=VZCtLyXPc2m2TADyxto1VVqsi3yS899X49n1vl0UHL0=; b=pGhh+aIH+fJwicwGAgZ7cLdFOXt7xjL4Me4W4qm9+4pOsN3Ram8sZwQdGIDlcheEowuUAznaUFKzNDtRHeZrhC/x+CQOE8ZV28kgYdYqjOg8bnuR5QaCrRJLocuV2mIVFZy/HEk8CoxedFuGNL0L+dFwOzDFskZL+ddymMzlZaU=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.2.3,REQID:c8e7dfbf-c494-4e62-ae7f-56df66f900dd,IP:0,UR L:0,TC:0,Content:0,EDM:-30,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-30 X-CID-META: VersionHash:09905cf,CLOUDID:6718d858-abad-4ac2-9923-3af0a8a9a079,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|50,EDM:2, IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV: 0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 283495fa4cbb11f0b33aeb1e7f16c2b6-20250619 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 269665794; Thu, 19 Jun 2025 11:11:56 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS09N2.mediatek.inc (172.21.101.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Thu, 19 Jun 2025 11:11:53 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 19 Jun 2025 11:11:53 +0800 From: Kyrie Wu To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Kyrie Wu , , , , , CC: Subject: [PATCH v6 07/12] media: mediatek: jpeg: fix decoding resolution change operation Date: Thu, 19 Jun 2025 11:11:35 +0800 Message-ID: <20250619031142.27180-8-kyrie.wu@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250619031142.27180-1-kyrie.wu@mediatek.com> References: <20250619031142.27180-1-kyrie.wu@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Content-Type: text/plain; charset="utf-8" 1.add a judgement for src buffer to avoid kernel crash in the stop streaming function; 2.When a resolution changing occurs, it needs to set new resolution parameter immediately and then report this event. Otherwise, if the original software process is maintained, the resolution change event is reported firstly, the CPU is dispatched to the app to process the event, and the driver does not set a new resolution, which will cause parameter errors. 3.After a resolution change occurred, decoding should not continue, needs to wait until new buffers are ready and the state machine changed. Fixes: dedc21500334 ("media: mtk-jpegdec: add jpeg decode worker interface") Signed-off-by: Kyrie Wu --- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers= /media/platform/mediatek/jpeg/mtk_jpeg_core.c index 3fc344d05528..e8d11fb3d330 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -887,7 +887,8 @@ static void mtk_jpeg_dec_stop_streaming(struct vb2_queu= e *q) =20 vb =3D v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); src_buf =3D mtk_jpeg_vb2_to_srcbuf(&vb->vb2_buf); - mtk_jpeg_set_queue_data(ctx, &src_buf->dec_param); + if (!IS_ERR_OR_NULL(src_buf)) + mtk_jpeg_set_queue_data(ctx, &src_buf->dec_param); ctx->state =3D MTK_JPEG_RUNNING; } else if (V4L2_TYPE_IS_OUTPUT(q->type)) { ctx->state =3D MTK_JPEG_INIT; @@ -1750,11 +1751,15 @@ static void mtk_jpegdec_worker(struct work_struct *= work) =20 if (mtk_jpeg_check_resolution_change(ctx, &jpeg_src_buf->dec_param)) { - mtk_jpeg_queue_src_chg_event(ctx); + mtk_jpeg_set_queue_data(ctx, &jpeg_src_buf->dec_param); ctx->state =3D MTK_JPEG_SOURCE_CHANGE; + mtk_jpeg_queue_src_chg_event(ctx); goto getbuf_fail; } =20 + if (ctx->state =3D=3D MTK_JPEG_SOURCE_CHANGE) + goto getbuf_fail; + mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf); ret =3D pm_runtime_resume_and_get(comp_jpeg[hw_id]->dev); if (ret < 0) { --=20 2.46.0