* [PATCH v2, 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly
@ 2022-06-10 1:53 Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Yunfei Dong @ 2022-06-10 1:53 UTC (permalink / raw)
To: Yunfei Dong, Alexandre Courbot, Nicolas Dufresne, Hans Verkuil,
AngeloGioacchino Del Regno, Benjamin Gaignard, Tiffany Lin,
Andrew-CT Chen, Mauro Carvalho Chehab, Rob Herring,
Matthias Brugger, Tomasz Figa
Cc: George Sun, Xiaoyong Lu, Hsin-Yi Wang, Fritz Koenig,
Daniel Vetter, dri-devel, Irui Wang, Steve Cho, linux-media,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
Fix v4l2 capability bus_info value with correct chip name according to compatible.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
changed with v1:
- change bus_info from "platform:mt%d" to "platform:mt%d-dec"
---
.../platform/mediatek/vcodec/mtk_vcodec_dec.c | 23 ++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
index 52e5d36aa912..4bdb5ae4a116 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
@@ -185,11 +185,32 @@ static int vidioc_vdec_dqbuf(struct file *file, void *priv,
return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);
}
+static int mtk_vcodec_dec_get_chip_name(void *priv)
+{
+ struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
+ struct device *dev = &ctx->dev->plat_dev->dev;
+
+ if (of_device_is_compatible(dev->of_node, "mediatek,mt8173-vcodec-dec"))
+ return 8173;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8183-vcodec-dec"))
+ return 8183;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8192-vcodec-dec"))
+ return 8192;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8195-vcodec-dec"))
+ return 8195;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8186-vcodec-dec"))
+ return 8186;
+ else
+ return 8173;
+}
+
static int vidioc_vdec_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
+ int platform_name = mtk_vcodec_dec_get_chip_name(priv);
+
strscpy(cap->driver, MTK_VCODEC_DEC_NAME, sizeof(cap->driver));
- strscpy(cap->bus_info, MTK_PLATFORM_STR, sizeof(cap->bus_info));
+ snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platform_name);
strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2, 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value
2022-06-10 1:53 [PATCH v2, 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
@ 2022-06-10 1:53 ` Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value Yunfei Dong
2 siblings, 0 replies; 4+ messages in thread
From: Yunfei Dong @ 2022-06-10 1:53 UTC (permalink / raw)
To: Yunfei Dong, Alexandre Courbot, Nicolas Dufresne, Hans Verkuil,
AngeloGioacchino Del Regno, Benjamin Gaignard, Tiffany Lin,
Andrew-CT Chen, Mauro Carvalho Chehab, Rob Herring,
Matthias Brugger, Tomasz Figa
Cc: George Sun, Xiaoyong Lu, Hsin-Yi Wang, Fritz Koenig,
Daniel Vetter, dri-devel, Irui Wang, Steve Cho, linux-media,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
Change the value of v4l2 capability parameters: driver and card.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
index 4bdb5ae4a116..1465ddff1c6b 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
@@ -209,9 +209,9 @@ static int vidioc_vdec_querycap(struct file *file, void *priv,
{
int platform_name = mtk_vcodec_dec_get_chip_name(priv);
- strscpy(cap->driver, MTK_VCODEC_DEC_NAME, sizeof(cap->driver));
+ strscpy(cap->driver, MTK_VCODEC_DRV_NAME, sizeof(cap->driver));
+ strscpy(cap->card, MTK_VCODEC_DEC_NAME, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platform_name);
- strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2, 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly
2022-06-10 1:53 [PATCH v2, 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
@ 2022-06-10 1:53 ` Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value Yunfei Dong
2 siblings, 0 replies; 4+ messages in thread
From: Yunfei Dong @ 2022-06-10 1:53 UTC (permalink / raw)
To: Yunfei Dong, Alexandre Courbot, Nicolas Dufresne, Hans Verkuil,
AngeloGioacchino Del Regno, Benjamin Gaignard, Tiffany Lin,
Andrew-CT Chen, Mauro Carvalho Chehab, Rob Herring,
Matthias Brugger, Tomasz Figa
Cc: George Sun, Xiaoyong Lu, Hsin-Yi Wang, Fritz Koenig,
Daniel Vetter, dri-devel, Irui Wang, Steve Cho, linux-media,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
Fix v4l2 capability bus_info value with correct chip name according to compatible.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
changed with v1:
- change bus_info from "platform:mt%d" to "platform:mt%d-enc"
---
.../platform/mediatek/vcodec/mtk_vcodec_enc.c | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
index c21367038c34..f22efad761d8 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
@@ -204,11 +204,30 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
pdata->num_output_formats);
}
+static int mtk_vcodec_enc_get_chip_name(void *priv)
+{
+ struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
+ struct device *dev = &ctx->dev->plat_dev->dev;
+
+ if (of_device_is_compatible(dev->of_node, "mediatek,mt8173-vcodec-enc"))
+ return 8173;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8183-vcodec-enc"))
+ return 8183;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8192-vcodec-enc"))
+ return 8192;
+ else if (of_device_is_compatible(dev->of_node, "mediatek,mt8195-vcodec-enc"))
+ return 8195;
+ else
+ return 8173;
+}
+
static int vidioc_venc_querycap(struct file *file, void *priv,
struct v4l2_capability *cap)
{
+ int platform_name = mtk_vcodec_enc_get_chip_name(priv);
+
strscpy(cap->driver, MTK_VCODEC_ENC_NAME, sizeof(cap->driver));
- strscpy(cap->bus_info, MTK_PLATFORM_STR, sizeof(cap->bus_info));
+ 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.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2, 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value
2022-06-10 1:53 [PATCH v2, 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly Yunfei Dong
@ 2022-06-10 1:53 ` Yunfei Dong
2 siblings, 0 replies; 4+ messages in thread
From: Yunfei Dong @ 2022-06-10 1:53 UTC (permalink / raw)
To: Yunfei Dong, Alexandre Courbot, Nicolas Dufresne, Hans Verkuil,
AngeloGioacchino Del Regno, Benjamin Gaignard, Tiffany Lin,
Andrew-CT Chen, Mauro Carvalho Chehab, Rob Herring,
Matthias Brugger, Tomasz Figa
Cc: George Sun, Xiaoyong Lu, Hsin-Yi Wang, Fritz Koenig,
Daniel Vetter, dri-devel, Irui Wang, Steve Cho, linux-media,
devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Project_Global_Chrome_Upstream_Group
Change the value of v4l2 capability parameters: driver and card.
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 1 -
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
index a29041a0b7e0..37add77e1c87 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
@@ -22,7 +22,6 @@
#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 f22efad761d8..d1211a675c33 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
@@ -226,9 +226,9 @@ static int vidioc_venc_querycap(struct file *file, void *priv,
{
int platform_name = mtk_vcodec_enc_get_chip_name(priv);
- strscpy(cap->driver, MTK_VCODEC_ENC_NAME, sizeof(cap->driver));
+ strscpy(cap->driver, MTK_VCODEC_DRV_NAME, sizeof(cap->driver));
+ strscpy(cap->card, MTK_VCODEC_ENC_NAME, sizeof(cap->card));
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.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-10 1:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-10 1:53 [PATCH v2, 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly Yunfei Dong
2022-06-10 1:53 ` [PATCH v2, 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value Yunfei Dong
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).