From: Chen-Yu Tsai <wenst@chromium.org>
To: Tiffany Lin <tiffany.lin@mediatek.com>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Yunfei Dong <yunfei.dong@mediatek.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Chen-Yu Tsai <wenst@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>
Subject: [PATCH 4/6] media: mediatek: vcodec: Revert driver name change in encoder capabilities
Date: Fri, 1 Jul 2022 18:52:35 +0800 [thread overview]
Message-ID: <20220701105237.932332-5-wenst@chromium.org> (raw)
In-Reply-To: <20220701105237.932332-1-wenst@chromium.org>
This partially reverts commit fd9f8050e355d7fd1e126cd207b06c96cde7f783.
The driver name field should contain the actual driver name, not some
otherwise unused string macro from the driver. To make this clear,
copy the name from the driver's name field.
Fixes: fd9f8050e355 ("media: mediatek: vcodec: Change encoder v4l2 capability value")
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 1 +
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
index 4140b4dd85bf..dc6aada882d9 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
@@ -22,6 +22,7 @@
#define MTK_VCODEC_DRV_NAME "mtk_vcodec_drv"
#define MTK_VCODEC_DEC_NAME "mtk-vcodec-dec"
#define MTK_VCODEC_ENC_NAME "mtk-vcodec-enc"
+#define MTK_PLATFORM_STR "platform:mt8173"
#define MTK_VCODEC_MAX_PLANES 3
#define MTK_V4L2_BENCHMARK 0
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
index ccc753074816..30aac54d97fa 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
@@ -232,11 +232,13 @@ static int mtk_vcodec_enc_get_chip_name(void *priv)
static int vidioc_venc_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
+ struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
+ struct device *dev = &ctx->dev->plat_dev->dev;
int platform_name = mtk_vcodec_enc_get_chip_name(priv);
- strscpy(cap->driver, MTK_VCODEC_DRV_NAME, sizeof(cap->driver));
- strscpy(cap->card, MTK_VCODEC_ENC_NAME, sizeof(cap->card));
+ strscpy(cap->driver, dev->driver->name, sizeof(cap->driver));
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platform_name);
+ strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
}
--
2.37.0.rc0.161.g10f37bed90-goog
next prev parent reply other threads:[~2022-07-01 10:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 10:52 [PATCH 0/6] media: mediatek-vcodec: Fix capability fields again Chen-Yu Tsai
2022-07-01 10:52 ` [PATCH 1/6] media: mediatek: vcodec: Revert driver name change in decoder capabilities Chen-Yu Tsai
2022-07-01 10:52 ` [PATCH 2/6] media: mediatek: vcodec: Use meaningful decoder card name including chip name Chen-Yu Tsai
2022-07-01 10:52 ` [PATCH 3/6] media: mediatek: vcodec: Use default bus_info for decoder capability Chen-Yu Tsai
2022-07-01 10:52 ` Chen-Yu Tsai [this message]
2022-07-08 9:19 ` [PATCH 4/6] media: mediatek: vcodec: Revert driver name change in encoder capabilities Hans Verkuil
2022-07-08 9:25 ` Chen-Yu Tsai
2022-07-01 10:52 ` [PATCH 5/6] media: mediatek: vcodec: Use meaningful encoder card name including chip name Chen-Yu Tsai
2022-07-01 10:52 ` [PATCH 6/6] media: mediatek: vcodec: Use default bus_info for encoder capability Chen-Yu Tsai
[not found] ` <e601a375-cc80-40cd-9791-e44e9d37cec0@email.android.com>
2022-07-01 13:10 ` [PATCH 0/6] media: mediatek-vcodec: Fix capability fields again Chen-Yu Tsai
2022-07-04 19:01 ` Nicolas Dufresne
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=20220701105237.932332-5-wenst@chromium.org \
--to=wenst@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--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=nicolas.dufresne@collabora.com \
--cc=tiffany.lin@mediatek.com \
--cc=yunfei.dong@mediatek.com \
/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
all inboxes | Powered by JetHome®