Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp587538pxh; Tue, 9 Nov 2021 15:45:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+4iCYl18LJ8RlTiUA6LBp7gKL21Fa6RAcLrfVAxEzzd91MrSd4KPW+63LK1nmD0CjNnsP X-Received: by 2002:a05:6e02:20c3:: with SMTP id 3mr8146939ilq.314.1636501511748; Tue, 09 Nov 2021 15:45:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636501511; cv=none; d=google.com; s=arc-20160816; b=KUBSBTLDqCE75VjelSVH1F7ySj88XTObsG5DRu73G6Ofx5x5qj0bUI2ithyX3Oa++d kCPJT5c9FJ0DeraAgtnolL17anvGfbbPqvRsps1m+6atMmFJ02uebj7CHTPb+thSz0WW 3LiM5yyN8yJbaM//IPRMz5jIbiXwewfa4geQ5hLzaiu/Yzd0yOYml5Iutenhf01J42w3 qDgMvenfrlba8BiDWOExbZBEd0duo5x8T6Q2vuBcFay9gVLqwpeeiqFH1iOIjVPWFl2T 2Df45DnfyDntvnPfxys50GqORcNR6uR8hY+xdobm90XaDG0N+7akB6Rq0MlUGINxcP6a Ly3g== 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; bh=ESXn8noHDuHQJS7RCZOFUoBMOpjH1IL6lUw9G6970lU=; b=hx3L5jkFzsqJjglDD4hryOfoDYGKC/QJiNDaes8eOc1FQgsEAy8b59eDohrRrFDgUU PDz2dABm+YMRXhwfDik1LW3OJ2vstEnmV3aLSoS5hN4Gyyj7vFZ2GG7sRX7bvgVR60py NzwtX98ZNpXw5nzkXH5SQUS478CVsNpfaXebECI/DgCVZlGj5Hvm0HIRibF8jGT99uLq qNDXvVgw97M8fCZiLsjpl3JF+Rl2RG74k+ba4UzTmKTofIqMsfocRNgpbs2//oBxLm7m V0glweOcpNe+7I1UjOGo4lShGThttQGVBHs/ihTIjE60ZFZeykHqtgGrlZ65ZfDHid6t QyCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si45319300ila.24.2021.11.09.15.44.59; Tue, 09 Nov 2021 15:45:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343682AbhKIMxd (ORCPT + 97 others); Tue, 9 Nov 2021 07:53:33 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:56816 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1343608AbhKIMxZ (ORCPT ); Tue, 9 Nov 2021 07:53:25 -0500 X-UUID: c809063033574404ba4f6ec7c45e6f72-20211109 X-UUID: c809063033574404ba4f6ec7c45e6f72-20211109 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1183950654; Tue, 09 Nov 2021 20:50:36 +0800 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Tue, 9 Nov 2021 20:50:35 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs10n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Tue, 9 Nov 2021 20:50:33 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Hans Verkuil , "Tzung-Bi Shih" , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa CC: Hsin-Yi Wang , Fritz Koenig , Dafna Hirschfeld , Benjamin Gaignard , Daniel Vetter , dri-devel , Irui Wang , , , , , , , Subject: [PATCH v9, 02/19] media: mtk-vcodec: Align vcodec wake up interrupt interface Date: Tue, 9 Nov 2021 20:50:13 +0800 Message-ID: <20211109125030.26299-3-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211109125030.26299-1-yunfei.dong@mediatek.com> References: <20211109125030.26299-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Vdec and venc can use the same function to wake up interrupt event. Reviewed-by: Tzung-Bi Shih Reviewed-By: AngeloGioacchino Del Regno Signed-off-by: Yunfei Dong --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 9 +-------- drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 8 ++++++++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 8 -------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index 59caf2163349..055d50e52720 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -31,13 +31,6 @@ module_param(mtk_v4l2_dbg_level, int, 0644); module_param(mtk_vcodec_dbg, bool, 0644); -/* Wake up context wait_queue */ -static void wake_up_ctx(struct mtk_vcodec_ctx *ctx) -{ - ctx->int_cond = 1; - wake_up_interruptible(&ctx->queue); -} - static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv) { struct mtk_vcodec_dev *dev = priv; @@ -69,7 +62,7 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv) writel((readl(vdec_misc_addr) & ~VDEC_IRQ_CLR), dev->reg_base[VDEC_MISC] + VDEC_IRQ_CFG_REG); - wake_up_ctx(ctx); + wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED); mtk_v4l2_debug(3, "mtk_vcodec_dec_irq_handler :wake up ctx %d, dec_done_status=%x", diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index 581522177308..1d2370608d0d 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -473,4 +473,12 @@ static inline struct mtk_vcodec_ctx *ctrl_to_ctx(struct v4l2_ctrl *ctrl) return container_of(ctrl->handler, struct mtk_vcodec_ctx, ctrl_hdl); } +/* Wake up context wait_queue */ +static inline void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason) +{ + ctx->int_cond = 1; + ctx->int_type = reason; + wake_up_interruptible(&ctx->queue); +} + #endif /* _MTK_VCODEC_DRV_H_ */ diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c index eed67394cf46..7c3487fb3498 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c @@ -65,14 +65,6 @@ static const struct mtk_video_fmt mtk_video_formats_capture_vp8[] = { }, }; -/* Wake up context wait_queue */ -static void wake_up_ctx(struct mtk_vcodec_ctx *ctx, unsigned int reason) -{ - ctx->int_cond = 1; - ctx->int_type = reason; - wake_up_interruptible(&ctx->queue); -} - static void clean_irq_status(unsigned int irq_status, void __iomem *addr) { if (irq_status & MTK_VENC_IRQ_STATUS_PAUSE) -- 2.25.1