Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2282576pxb; Thu, 28 Oct 2021 20:56:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNEzFvnDIDZv1ZuqP0wKZr9D6SMztrDdyIPcMpycCAStskg3k8U2SGJ/GPz0lrZ8H7AxHZ X-Received: by 2002:a63:3446:: with SMTP id b67mr6260318pga.258.1635479816520; Thu, 28 Oct 2021 20:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635479816; cv=none; d=google.com; s=arc-20160816; b=YbZ3+S8VHoACsqBjg3qp8vqDnOiIMEEr7XP0tUrYOWJ3wx0EiuPwQ+UoPhc6IzCoCS h0LmDpUi3GbpB3FZtcEQQflQztlj/KsQiOyzkCzXkphMhtKrxSSAmRdIyU2ot9iPmr/s Qic8T9hOJfEtdboVtYMsLXKK05/8qyvsYHW6onGbOz3EWZB/2MDW+dYoiHrkNV9G3SA5 E7PryNidjhQlc+YnLjQirrsLoGCpP+TfnsHI1yn/sL3LzSdutsybnQoCk040Rm11pi8J 65ZLPPDliSz0BISrs4YGsmTXfa61J/hCRGW4yTfbXXclbATv1iwcRc434fQEFJRStd28 ouMg== 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=vPh0bZx/7f4lGYgrmpxfHcwd/09VOd8sSaORM2GZO0TdgBSxN5ZBUGkC6CqY0v/pgE OzbtJ2fSbNlTNKeBLfaEVh605272QzAchwaTPCymrmYK0QArpqmEjzkGQ2aflhB26ANC +CWmq2frYaoYiW7zQLs/m9ZdRn1MfvfwVVL8g0LOmjClIjmkOOaASin0AZW+PPrP4XeO vsBW2vHbZWoD3bxjkbrUL+I4i5i+kPO4q9JbGyT/8ZwWeZMMyUgFmbR7csGxNEoK5bIE DBOQ0JSCXCicAI476j9uAdaF2OfoRt52rvWZfpI8jQRup//OTlipJ3UoA0DHyqtw193m q7nQ== 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 10si5650210pfl.261.2021.10.28.20.56.43; Thu, 28 Oct 2021 20:56:56 -0700 (PDT) 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 S231761AbhJ2D6L (ORCPT + 99 others); Thu, 28 Oct 2021 23:58:11 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:44060 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S231611AbhJ2D6F (ORCPT ); Thu, 28 Oct 2021 23:58:05 -0400 X-UUID: fd5b81e08bae466b93669b29f3ad7b21-20211029 X-UUID: fd5b81e08bae466b93669b29f3ad7b21-20211029 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 720946010; Fri, 29 Oct 2021 11:55:34 +0800 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Fri, 29 Oct 2021 11:55:33 +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; Fri, 29 Oct 2021 11:55:32 +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 , , , , , , , , Tzung-Bi Shih , AngeloGioacchino Del Regno Subject: [PATCH v8, 02/17] media: mtk-vcodec: Align vcodec wake up interrupt interface Date: Fri, 29 Oct 2021 11:55:12 +0800 Message-ID: <20211029035527.454-3-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029035527.454-1-yunfei.dong@mediatek.com> References: <20211029035527.454-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