From patchwork Wed Feb 1 07:33:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WXVuZmVpIERvbmcgKOiRo+S6kemjnik=?= X-Patchwork-Id: 51209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2388:b0:96:219d:e725 with SMTP id i8csp249406dyf; Tue, 31 Jan 2023 23:37:58 -0800 (PST) X-Google-Smtp-Source: AK7set/hExbh90TL40xnGpNCsdH8tGJIo4UdQv9Bx3ygu6qeVDaylIRqDH/Nz38huGgxc+TNY86p X-Received: by 2002:a05:6402:248b:b0:4a2:dac:d2a4 with SMTP id q11-20020a056402248b00b004a20dacd2a4mr1113566eda.9.1675237078090; Tue, 31 Jan 2023 23:37:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675237078; cv=none; d=google.com; s=arc-20160816; b=EFUEBLSr4797drqSp9F1kcB/aNtjZ1N+TUAoBP+sPHQOr82TwQJQTv5RgfesAYsMto hdmAJHO/9op2VChnrWvoRVzOgrLlCrcDtwcMgrAh9gZpp+QSgEIV73Qoq/8TeATJ0RrD gvkmkyS9gKOr5/7/L9iqMQjKYDEG0fh3uLbsc+BBRhDhVlmE3NJwf/JhJut0uSPxG+xn GaTRcNrR0V80Fe+WJQjtJTRtmhymeUDKL+w2lUaaUEuVJMHBW4q88XqPey4kwMWspSbG 3u4PJ0/YLqqxN6jsGP9eU5+8n3dr3ECXSe4jUFNpovm493DJ3JHEkeEJYUy4ICE4MH4j HZNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yicZlhgHEByptDrJJcDgc4g/qNfy8/ddnqXBGAC7QFM=; b=NdHbA8HatMgRVKelP7oikZpKE3qRN4wfLXEzuofxMkky9+laKnNxzlxWlDFtnID6v1 kTQGY8C28RVDxLjeVDt7OanrdtQ8wUYsY2EOZ9GsuoK9V5Q7KdM8AVS16nvoNPF294HT iqFVuzdnr6SyEuBrffOG2twG8ZATFcH2VIibtVrrZ8XIgTRrNBs0eHY/9NADCefPVLKM 4e+x0MhqtK2BmZ1xBBPpXK/Lh/Ms2VgMY8W45VwYcYeLA5Yy2KSvuLS2mZh9B5pPMkFu o2k9svHos8WSgNRjWlDo/zuHyCNFf0ieu2qFcFcpb3XmRVUDnq6h0SPMyx0zITMq+kTy 7xaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="E/6oPFiB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n11-20020a056402060b00b004a0ab10b040si19662862edv.448.2023.01.31.23.37.04; Tue, 31 Jan 2023 23:37:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b="E/6oPFiB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231781AbjBAHd5 (ORCPT + 99 others); Wed, 1 Feb 2023 02:33:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbjBAHdj (ORCPT ); Wed, 1 Feb 2023 02:33:39 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F258975E; Tue, 31 Jan 2023 23:33:29 -0800 (PST) X-UUID: b654cbf4a20211ed945fc101203acc17-20230201 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=yicZlhgHEByptDrJJcDgc4g/qNfy8/ddnqXBGAC7QFM=; b=E/6oPFiBePt3NDUN56vAXNUzDwnXEEZl+MivuEkCt4mnXCm0t4PbKDkw6BNGjUYX0Th2Wtap2Iog50VRBpnvgHqp5hhGdEdKTgj5/jZMdLGbRA8E06fmjlLrQ61LXhgzFTzM0tWa2+XsxHXKr4cqLGcy3dEx3UhcZksvX7VoTVk=; X-CID-P-RULE: Spam_GS6885AD X-CID-O-INFO: VERSION:1.1.18,REQID:ad230056-78e9-4399-b295-86c22c7c5892,IP:0,U RL:0,TC:0,Content:0,EDM:25,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS6885AD,ACT ION:quarantine,TS:120 X-CID-INFO: VERSION:1.1.18,REQID:ad230056-78e9-4399-b295-86c22c7c5892,IP:0,URL :0,TC:0,Content:0,EDM:25,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTIO N:quarantine,TS:120 X-CID-META: VersionHash:3ca2d6b,CLOUDID:7ba51ef7-ff42-4fb0-b929-626456a83c14,B ulkID:230201153326Y1WHBXPM,BulkQuantity:0,Recheck:0,SF:38|29|28|17|19|48,T C:nil,Content:0,EDM:5,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0 X-CID-BVR: 0 X-UUID: b654cbf4a20211ed945fc101203acc17-20230201 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1781945916; Wed, 01 Feb 2023 15:33:25 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Wed, 1 Feb 2023 15:33:23 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Wed, 1 Feb 2023 15:33:22 +0800 From: Yunfei Dong To: Yunfei Dong , Chen-Yu Tsai , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Tiffany Lin CC: Mauro Carvalho Chehab , Matthias Brugger , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , , , , , , Subject: [PATCH v4,4/7] media: mediatek: vcodec: add core decode done event Date: Wed, 1 Feb 2023 15:33:13 +0800 Message-ID: <20230201073316.27923-5-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230201073316.27923-1-yunfei.dong@mediatek.com> References: <20230201073316.27923-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_SPF_TEMPERROR,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756613394771220240?= X-GMAIL-MSGID: =?utf-8?q?1756613394771220240?= Need to make sure core decode done before current instance is free. Fixes: 365e4ba01df4 ("media: mtk-vcodec: Add work queue for core hardware decode") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c | 4 +++- drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c index 0da6e3e2ef0b..ce7c82e38103 100644 --- a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c +++ b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c @@ -196,7 +196,7 @@ bool vdec_msg_queue_wait_lat_buf_full(struct vdec_msg_queue *msg_queue) spin_unlock(&core_ctx->ready_lock); timeout_jiff = msecs_to_jiffies(1000 * (NUM_BUFFER_COUNT + 2)); - ret = wait_event_timeout(msg_queue->lat_ctx.ready_to_use, + ret = wait_event_timeout(msg_queue->ctx->msg_queue.core_dec_done, msg_queue->lat_ctx.ready_num == NUM_BUFFER_COUNT, timeout_jiff); if (ret) { @@ -257,6 +257,7 @@ static void vdec_msg_queue_core_work(struct work_struct *work) mtk_vcodec_dec_disable_hardware(ctx, MTK_VDEC_CORE); vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf); + wake_up_all(&ctx->msg_queue.core_dec_done); if (atomic_read(&lat_buf->ctx->msg_queue.core_list_cnt)) { mtk_v4l2_debug(3, "re-schedule to decode for core: %d", dev->msg_queue_core_ctx.ready_num); @@ -281,6 +282,7 @@ int vdec_msg_queue_init(struct vdec_msg_queue *msg_queue, atomic_set(&msg_queue->lat_list_cnt, 0); atomic_set(&msg_queue->core_list_cnt, 0); + init_waitqueue_head(&msg_queue->core_dec_done); msg_queue->wdma_addr.size = vde_msg_queue_get_trans_size(ctx->picinfo.buf_w, diff --git a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h index 56280d6682c5..a75c04418f52 100644 --- a/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h +++ b/drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h @@ -76,6 +76,7 @@ struct vdec_lat_buf { * * @lat_list_cnt: used to record each instance lat list count * @core_list_cnt: used to record each instance core list count + * @core_dec_done: core work queue decode done event */ struct vdec_msg_queue { struct vdec_lat_buf lat_buf[NUM_BUFFER_COUNT]; @@ -90,6 +91,7 @@ struct vdec_msg_queue { atomic_t lat_list_cnt; atomic_t core_list_cnt; + wait_queue_head_t core_dec_done; }; /**