From nobody Wed Nov 27 06:36:42 2024 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 A672214B08A; Mon, 14 Oct 2024 07:33:22 +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=1728891205; cv=none; b=h9BRrjaEiWpFX+LSdmW+D3gedjwNJ3x6IZYQBUDJzwFyYCpDNhmsWUJchlDRQH/FhWCbq7gAnI9kQiKHMeg7j/pdftnSKpPa9h7lj5tlMpHiA8NQBrlIo9rdSvsdGrTV6ZqWtnYSN96lxN3AhtOoKYPrEPQhKLUL3gnL49C6RSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728891205; c=relaxed/simple; bh=qz15bu6bYb3xktXI0uoLG02EdRCEmvUeLe2hLnmmTDM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VLuBxx7CUT8lC81QmMiCuuW/g6yU6h4lKtUNPIlmb0TAa49KZIxfQtgs7Tj0cAnDAqmElyESjEic53o7qZ7atb3lNjZloVDLhzRsnsIR8AJt5/bPgDFDvS2f4q9MmLMcXfC10QAzYzQiO5nRZSHv4efrzc8KGAp4jKNxw7N4FRM= 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=qlEG9kG8; 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="qlEG9kG8" X-UUID: 9333341889fe11ef8b96093e013ec31c-20241014 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=YZXjZ2gAHgp0+xo3WWjS1eWXo3ndI/jilYVGWevQwk4=; b=qlEG9kG8S7UrzodL5GH8Kvk3CM8LrXsODuzzfPmnCKho27cHqRnSkm/KJQQohaivFHVNfq/MaYrCqQqQ04xAGwcolSGnCCRxrRZ6l5GO8ralbQP/Lx1ot2KdfAmCQ+lcNi5Ia7W4+Iwwo1E/PRo4xv68FXI0HRFqbhf0UqqVQRw=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.41,REQID:8a90bd23-55e1-4b73-84f3-5a8d8839d4f8,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6dc6a47,CLOUDID:f5913641-8751-41b2-98dd-475503d45150,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL: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-UUID: 9333341889fe11ef8b96093e013ec31c-20241014 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 140826903; Mon, 14 Oct 2024 15:33:15 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 14 Oct 2024 15:33:14 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 14 Oct 2024 15:33:13 +0800 From: Yunfei Dong To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Sebastian Fricke , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Nathan Hebert , Daniel Almeida CC: Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , Yunfei Dong , , , , , , Subject: [PATCH 3/6] media: mediatek: vcodec: remove vsi operation in common interface Date: Mon, 14 Oct 2024 15:33:07 +0800 Message-ID: <20241014073314.18409-4-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241014073314.18409-1-yunfei.dong@mediatek.com> References: <20241014073314.18409-1-yunfei.dong@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" Remove vsi related operation in common interface to make sure the interface can be called by different architecture at the same time. Signed-off-by: Yunfei Dong --- .../decoder/vdec/vdec_h264_req_multi_if.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_= req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h= 264_req_multi_if.c index 76b96924a2a7..02ad579bfe8e 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_mul= ti_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_mul= ti_if.c @@ -187,9 +187,9 @@ struct vdec_h264_slice_inst { }; =20 static int vdec_h264_slice_fill_decode_parameters(struct vdec_h264_slice_i= nst *inst, - struct vdec_h264_slice_share_info *share_info) + struct vdec_h264_slice_share_info *share_info, + struct vdec_h264_slice_lat_dec_param *slice_data) { - struct vdec_h264_slice_lat_dec_param *slice_param =3D &inst->vsi->h264_sl= ice_params; const struct v4l2_ctrl_h264_decode_params *dec_params; const struct v4l2_ctrl_h264_scaling_matrix *src_matrix; const struct v4l2_ctrl_h264_sps *sps; @@ -219,9 +219,9 @@ static int vdec_h264_slice_fill_decode_parameters(struc= t vdec_h264_slice_inst *i return -EINVAL; } =20 - mtk_vdec_h264_copy_sps_params(&slice_param->sps, sps); - mtk_vdec_h264_copy_pps_params(&slice_param->pps, pps); - mtk_vdec_h264_copy_scaling_matrix(&slice_param->scaling_matrix, src_matri= x); + mtk_vdec_h264_copy_sps_params(&slice_data->sps, sps); + mtk_vdec_h264_copy_pps_params(&slice_data->pps, pps); + mtk_vdec_h264_copy_scaling_matrix(&slice_data->scaling_matrix, src_matrix= ); =20 memcpy(&share_info->sps, sps, sizeof(*sps)); memcpy(&share_info->dec_params, dec_params, sizeof(*dec_params)); @@ -282,9 +282,6 @@ static int get_vdec_sig_decode_parameters(struct vdec_h= 264_slice_inst *inst) mtk_vdec_h264_get_ref_list(b0_reflist, v4l2_b0_reflist, reflist_builder.n= um_valid); mtk_vdec_h264_get_ref_list(b1_reflist, v4l2_b1_reflist, reflist_builder.n= um_valid); =20 - memcpy(&inst->vsi_ctx.h264_slice_params, slice_param, - sizeof(inst->vsi_ctx.h264_slice_params)); - return 0; } =20 @@ -664,7 +661,8 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, str= uct mtk_vcodec_mem *bs, lat_buf->vb2_v4l2_src =3D &src_buf_info->m2m_buf.vb; v4l2_m2m_buf_copy_metadata(&src_buf_info->m2m_buf.vb, &lat_buf->ts_info, = true); =20 - err =3D vdec_h264_slice_fill_decode_parameters(inst, share_info); + err =3D vdec_h264_slice_fill_decode_parameters(inst, share_info, + &inst->vsi->h264_slice_params); if (err) goto err_free_fb_out; =20 @@ -788,6 +786,9 @@ static int vdec_h264_slice_single_decode(void *h_vdec, = struct mtk_vcodec_mem *bs if (err) goto err_free_fb_out; =20 + memcpy(&inst->vsi_ctx.h264_slice_params, &inst->h264_slice_param, + sizeof(inst->vsi_ctx.h264_slice_params)); + buf =3D (unsigned char *)bs->va; nal_start_idx =3D mtk_vdec_h264_find_start_code(buf, bs->size); if (nal_start_idx < 0) { --=20 2.46.0