* [PATCH 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value
2022-05-26 9:57 [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
@ 2022-05-26 9:57 ` Yunfei Dong
2022-05-26 9:57 ` [PATCH 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly Yunfei Dong
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Yunfei Dong @ 2022-05-26 9:57 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 ccfa426a34ab..d4880737ea81 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", platform_name);
- strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
}
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly
2022-05-26 9:57 [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
2022-05-26 9:57 ` [PATCH 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
@ 2022-05-26 9:57 ` Yunfei Dong
2022-05-26 9:57 ` [PATCH 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value Yunfei Dong
2022-06-09 10:08 ` [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Hans Verkuil
3 siblings, 0 replies; 6+ messages in thread
From: Yunfei Dong @ 2022-05-26 9:57 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>
---
.../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..8ece3596081a 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", platform_name);
strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value
2022-05-26 9:57 [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
2022-05-26 9:57 ` [PATCH 2/4] media: mediatek: vcodec: Change decoder v4l2 capability value Yunfei Dong
2022-05-26 9:57 ` [PATCH 3/4] media: mediatek: vcodec: Fix encoder v4l2 bus_info not correctly Yunfei Dong
@ 2022-05-26 9:57 ` Yunfei Dong
2022-06-09 10:08 ` [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Hans Verkuil
3 siblings, 0 replies; 6+ messages in thread
From: Yunfei Dong @ 2022-05-26 9:57 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 8ece3596081a..b30e88cfb717 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", platform_name);
- strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
return 0;
}
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly
2022-05-26 9:57 [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Yunfei Dong
` (2 preceding siblings ...)
2022-05-26 9:57 ` [PATCH 4/4] media: mediatek: vcodec: Change encoder v4l2 capability value Yunfei Dong
@ 2022-06-09 10:08 ` Hans Verkuil
2022-06-10 1:43 ` yunfei.dong
3 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2022-06-09 10:08 UTC (permalink / raw)
To: Yunfei Dong, Alexandre Courbot, Nicolas Dufresne,
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
Hi Yunfei Dong,
On 5/26/22 11:57, Yunfei Dong wrote:
> Fix v4l2 capability bus_info value with correct chip name according to compatible.
>
> Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
> ---
> .../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..ccfa426a34ab 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;
> +}
Nice, but...
> +
> 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", platform_name);
...this will result in identical bus_info values for the decoder and encoder
video devices. The bus_info field is supposed to be unique, and that's now
no longer the case.
I suggest changing this to:
snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platform_name);
(and '-enc' for the encoder patch).
Regards,
Hans
> strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
>
> return 0;
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly
2022-06-09 10:08 ` [PATCH 1/4] media: mediatek: vcodec: Fix decoder v4l2 bus_info not correctly Hans Verkuil
@ 2022-06-10 1:43 ` yunfei.dong
0 siblings, 0 replies; 6+ messages in thread
From: yunfei.dong @ 2022-06-10 1:43 UTC (permalink / raw)
To: Hans Verkuil, Alexandre Courbot, Nicolas Dufresne,
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
Dear Hans,
Thanks for your suggestion.
I will fix bus_info in patch v2:
decoder: "platform:mt%d" to "platform:mt%d-dec"
encoder: "platform:mt%d" to "platform:mt%d-enc"
Best Regards,
Yunfei Dong
On Thu, 2022-06-09 at 12:08 +0200, Hans Verkuil wrote:
> Hi Yunfei Dong,
>
> On 5/26/22 11:57, Yunfei Dong wrote:
> > Fix v4l2 capability bus_info value with correct chip name according
> > to compatible.
> >
> > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
> > ---
> > .../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..ccfa426a34ab 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;
> > +}
>
> Nice, but...
>
> > +
> > 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",
> > platform_name);
>
> ...this will result in identical bus_info values for the decoder and
> encoder
> video devices. The bus_info field is supposed to be unique, and
> that's now
> no longer the case.
>
> I suggest changing this to:
>
> snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-
> dec", platform_name);
>
> (and '-enc' for the encoder patch).
>
> Regards,
>
> Hans
>
> > strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card));
> >
> > return 0;
^ permalink raw reply [flat|nested] 6+ messages in thread