From: Yunfei Dong <yunfei.dong@mediatek.com>
To: Yunfei Dong <yunfei.dong@mediatek.com>,
Alexandre Courbot <acourbot@chromium.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Tzung-Bi Shih <tzungbi@chromium.org>,
Tiffany Lin <tiffany.lin@mediatek.com>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Tomasz Figa <tfiga@google.com>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>,
Fritz Koenig <frkoenig@chromium.org>,
Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Daniel Vetter <daniel@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
Irui Wang <irui.wang@mediatek.com>, <linux-media@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<srv_heupstream@mediatek.com>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>
Subject: [PATCH v7, 10/15] media: mtk-vcodec: Add new interface to lock different hardware
Date: Mon, 11 Oct 2021 15:02:42 +0800 [thread overview]
Message-ID: <20211011070247.792-11-yunfei.dong@mediatek.com> (raw)
In-Reply-To: <20211011070247.792-1-yunfei.dong@mediatek.com>
For add new hardware, not only need to lock lat hardware, also
need to lock core hardware in case of different instance start
to decoder at the same time.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++--
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 6 +++---
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index 2b334a8a81c6..130ecef2e766 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -105,12 +105,12 @@ static int vidioc_decoder_cmd(struct file *file, void *priv,
void mtk_vdec_unlock(struct mtk_vcodec_ctx *ctx)
{
- mutex_unlock(&ctx->dev->dec_mutex);
+ mutex_unlock(&ctx->dev->dec_mutex[ctx->hw_id]);
}
void mtk_vdec_lock(struct mtk_vcodec_ctx *ctx)
{
- mutex_lock(&ctx->dev->dec_mutex);
+ mutex_lock(&ctx->dev->dec_mutex[ctx->hw_id]);
}
void mtk_vcodec_dec_release(struct mtk_vcodec_ctx *ctx)
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 3ea1e96e0ec0..e21e0c4bcd86 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -332,7 +332,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
struct video_device *vfd_dec;
phandle rproc_phandle;
enum mtk_vcodec_fw_type fw_type;
- int ret;
+ int i, ret;
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
if (!dev)
@@ -364,8 +364,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
goto err_dec_pm;
}
- mutex_init(&dev->dec_mutex);
- mutex_init(&dev->dev_mutex);
+ for (i = 0; i < MTK_VDEC_HW_MAX; i++)
+ mutex_init(&dev->dec_mutex[i]);
spin_lock_init(&dev->irqlock);
snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s",
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 95c82cb4e568..9d072c082f73 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -498,7 +498,7 @@ struct mtk_vcodec_dev {
int dec_irq;
int enc_irq;
- struct mutex dec_mutex;
+ struct mutex dec_mutex[MTK_VDEC_HW_MAX];
struct mutex enc_mutex;
struct mtk_vcodec_pm pm;
--
2.25.1
next prev parent reply other threads:[~2021-10-11 7:04 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 7:02 [PATCH v7, 00/15] Support multi hardware decode using of_platform_populate Yunfei Dong
2021-10-11 7:02 ` [PATCH v7, 01/15] media: mtk-vcodec: Get numbers of register bases from DT Yunfei Dong
2021-10-11 7:02 ` [PATCH v7, 02/15] media: mtk-vcodec: Align vcodec wake up interrupt interface Yunfei Dong
2021-10-14 11:12 ` AngeloGioacchino Del Regno
2021-10-11 7:02 ` [PATCH v7, 03/15] media: mtk-vcodec: Refactor vcodec pm interface Yunfei Dong
2021-10-14 11:12 ` AngeloGioacchino Del Regno
2021-10-14 13:44 ` Dafna Hirschfeld
2021-10-29 3:29 ` yunfei.dong
2021-10-11 7:02 ` [PATCH v7, 04/15] media: mtk-vcodec: Manage multi hardware information Yunfei Dong
2021-10-14 9:20 ` AngeloGioacchino Del Regno
2021-10-29 3:05 ` yunfei.dong
2021-10-14 9:30 ` AngeloGioacchino Del Regno
2021-10-11 7:02 ` [PATCH v7, 05/15] dt-bindings: media: mtk-vcodec: Separate video encoder and decoder dt-bindings Yunfei Dong
2021-10-11 7:02 ` [PATCH v7, 06/15] media: mtk-vcodec: Use pure single core for MT8183 Yunfei Dong
2021-10-14 11:13 ` AngeloGioacchino Del Regno
2021-10-11 7:02 ` [PATCH v7, 07/15] media: mtk-vcodec: Add irq interface for multi hardware Yunfei Dong
2021-10-14 10:04 ` AngeloGioacchino Del Regno
2021-10-27 11:36 ` yunfei.dong
2021-10-11 7:02 ` [PATCH v7, 08/15] media: mtk-vcodec: Add msg queue feature for lat and core architecture Yunfei Dong
2021-10-14 10:35 ` AngeloGioacchino Del Regno
2021-10-27 4:01 ` yunfei.dong
2021-10-11 7:02 ` [PATCH v7, 09/15] media: mtk-vcodec: Generalize power and clock on/off interfaces Yunfei Dong
2021-10-14 10:44 ` AngeloGioacchino Del Regno
2021-10-27 3:55 ` yunfei.dong
2021-10-11 7:02 ` Yunfei Dong [this message]
2021-10-14 10:47 ` [PATCH v7, 10/15] media: mtk-vcodec: Add new interface to lock different hardware AngeloGioacchino Del Regno
2021-10-11 7:02 ` [PATCH v7, 11/15] media: mtk-vcodec: Add core thread Yunfei Dong
2021-10-14 10:56 ` AngeloGioacchino Del Regno
2021-10-27 3:47 ` yunfei.dong
2021-10-14 12:29 ` Ezequiel Garcia
2021-10-29 3:25 ` yunfei.dong
2021-10-11 7:02 ` [PATCH v7, 12/15] media: mtk-vcodec: Support 34bits dma address for vdec Yunfei Dong
2021-10-14 11:02 ` AngeloGioacchino Del Regno
2021-10-27 3:44 ` yunfei.dong
2021-10-11 7:02 ` [PATCH v7, 13/15] dt-bindings: media: mtk-vcodec: Adds decoder dt-bindings for mt8192 Yunfei Dong
2021-10-11 13:36 ` Rob Herring
2021-10-11 7:02 ` [PATCH v7, 14/15] media: mtk-vcodec: Add core dec and dec end ipi msg Yunfei Dong
2021-10-14 11:04 ` AngeloGioacchino Del Regno
2021-10-11 7:02 ` [PATCH v7, 15/15] media: mtk-vcodec: Use codec type to separate different hardware Yunfei Dong
2021-10-14 11:08 ` AngeloGioacchino Del Regno
2021-10-12 14:27 ` [PATCH v7, 00/15] Support multi hardware decode using of_platform_populate Andrzej Pietrasiewicz
2021-10-13 1:08 ` yunfei.dong
2021-10-13 10:55 ` Andrzej Pietrasiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211011070247.792-11-yunfei.dong@mediatek.com \
--to=yunfei.dong@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=benjamin.gaignard@collabora.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=frkoenig@chromium.org \
--cc=hsinyi@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=irui.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=tiffany.lin@mediatek.com \
--cc=tzungbi@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).