* [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL
@ 2024-06-04 5:15 Christian Hewitt
2024-06-04 5:15 ` [PATCH 2/2] media: meson: vdec: add GXLX SoC platform Christian Hewitt
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Christian Hewitt @ 2024-06-04 5:15 UTC (permalink / raw)
To: Neil Armstrong, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Greg Kroah-Hartman,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl, linux-media,
linux-amlogic, devicetree, linux-staging, linux-arm-kernel,
linux-kernel
The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
and S905Y as GXL chips and sort the GXL comment.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
index 55930f6107c9..47dce75aeae6 100644
--- a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
@@ -31,7 +31,8 @@ properties:
- items:
- enum:
- amlogic,gxbb-vdec # GXBB (S905)
- - amlogic,gxl-vdec # GXL (S905X, S905D)
+ - amlogic,gxl-vdec # GXL (S905D, S905W, S905X, S905Y)
+ - amlogic,gxlx-vdec # GXLX (S905L)
- amlogic,gxm-vdec # GXM (S912)
- const: amlogic,gx-vdec
- enum:
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] media: meson: vdec: add GXLX SoC platform
2024-06-04 5:15 [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Christian Hewitt
@ 2024-06-04 5:15 ` Christian Hewitt
2024-06-07 16:04 ` Neil Armstrong
2024-06-04 6:28 ` [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Christian Hewitt @ 2024-06-04 5:15 UTC (permalink / raw)
To: Neil Armstrong, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Greg Kroah-Hartman,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl, linux-media,
linux-amlogic, devicetree, linux-staging, linux-arm-kernel,
linux-kernel
Add the GXLX SoC platform which is based on GXL but omits the VP9 codec.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/staging/media/meson/vdec/vdec.c | 2 +
.../staging/media/meson/vdec/vdec_platform.c | 44 +++++++++++++++++++
.../staging/media/meson/vdec/vdec_platform.h | 2 +
3 files changed, 48 insertions(+)
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index de3e0345ab7c..5e5b296f93ba 100644
--- a/drivers/staging/media/meson/vdec/vdec.c
+++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -982,6 +982,8 @@ static const struct of_device_id vdec_dt_match[] = {
.data = &vdec_platform_gxm },
{ .compatible = "amlogic,gxl-vdec",
.data = &vdec_platform_gxl },
+ { .compatible = "amlogic,gxlx-vdec",
+ .data = &vdec_platform_gxlx },
{ .compatible = "amlogic,g12a-vdec",
.data = &vdec_platform_g12a },
{ .compatible = "amlogic,sm1-vdec",
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
index 70c9fd7c8bc5..66bb307db85a 100644
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
@@ -101,6 +101,44 @@ static const struct amvdec_format vdec_formats_gxl[] = {
},
};
+static const struct amvdec_format vdec_formats_gxlx[] = {
+ {
+ .pixfmt = V4L2_PIX_FMT_H264,
+ .min_buffers = 2,
+ .max_buffers = 24,
+ .max_width = 3840,
+ .max_height = 2160,
+ .vdec_ops = &vdec_1_ops,
+ .codec_ops = &codec_h264_ops,
+ .firmware_path = "meson/vdec/gxl_h264.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
+ }, {
+ .pixfmt = V4L2_PIX_FMT_MPEG1,
+ .min_buffers = 8,
+ .max_buffers = 8,
+ .max_width = 1920,
+ .max_height = 1080,
+ .vdec_ops = &vdec_1_ops,
+ .codec_ops = &codec_mpeg12_ops,
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ }, {
+ .pixfmt = V4L2_PIX_FMT_MPEG2,
+ .min_buffers = 8,
+ .max_buffers = 8,
+ .max_width = 1920,
+ .max_height = 1080,
+ .vdec_ops = &vdec_1_ops,
+ .codec_ops = &codec_mpeg12_ops,
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ },
+};
+
static const struct amvdec_format vdec_formats_gxm[] = {
{
.pixfmt = V4L2_PIX_FMT_VP9,
@@ -263,6 +301,12 @@ const struct vdec_platform vdec_platform_gxl = {
.revision = VDEC_REVISION_GXL,
};
+const struct vdec_platform vdec_platform_gxlx = {
+ .formats = vdec_formats_gxlx,
+ .num_formats = ARRAY_SIZE(vdec_formats_gxlx),
+ .revision = VDEC_REVISION_GXLX,
+};
+
const struct vdec_platform vdec_platform_gxm = {
.formats = vdec_formats_gxm,
.num_formats = ARRAY_SIZE(vdec_formats_gxm),
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.h b/drivers/staging/media/meson/vdec/vdec_platform.h
index 731877a771f4..88ca4a9db8a8 100644
--- a/drivers/staging/media/meson/vdec/vdec_platform.h
+++ b/drivers/staging/media/meson/vdec/vdec_platform.h
@@ -14,6 +14,7 @@ struct amvdec_format;
enum vdec_revision {
VDEC_REVISION_GXBB,
VDEC_REVISION_GXL,
+ VDEC_REVISION_GXLX,
VDEC_REVISION_GXM,
VDEC_REVISION_G12A,
VDEC_REVISION_SM1,
@@ -28,6 +29,7 @@ struct vdec_platform {
extern const struct vdec_platform vdec_platform_gxbb;
extern const struct vdec_platform vdec_platform_gxm;
extern const struct vdec_platform vdec_platform_gxl;
+extern const struct vdec_platform vdec_platform_gxlx;
extern const struct vdec_platform vdec_platform_g12a;
extern const struct vdec_platform vdec_platform_sm1;
--
2.34.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL
2024-06-04 5:15 [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Christian Hewitt
2024-06-04 5:15 ` [PATCH 2/2] media: meson: vdec: add GXLX SoC platform Christian Hewitt
@ 2024-06-04 6:28 ` Krzysztof Kozlowski
2024-06-07 16:05 ` Neil Armstrong
2024-06-24 8:16 ` Neil Armstrong
3 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-04 6:28 UTC (permalink / raw)
To: Christian Hewitt, Neil Armstrong, Mauro Carvalho Chehab,
Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Greg Kroah-Hartman, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, linux-media, linux-amlogic, devicetree,
linux-staging, linux-arm-kernel, linux-kernel
On 04/06/2024 07:15, Christian Hewitt wrote:
> The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
> and S905Y as GXL chips and sort the GXL comment.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] media: meson: vdec: add GXLX SoC platform
2024-06-04 5:15 ` [PATCH 2/2] media: meson: vdec: add GXLX SoC platform Christian Hewitt
@ 2024-06-07 16:04 ` Neil Armstrong
0 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2024-06-07 16:04 UTC (permalink / raw)
To: Christian Hewitt, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Greg Kroah-Hartman,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl, linux-media,
linux-amlogic, devicetree, linux-staging, linux-arm-kernel,
linux-kernel
On 04/06/2024 07:15, Christian Hewitt wrote:
> Add the GXLX SoC platform which is based on GXL but omits the VP9 codec.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> drivers/staging/media/meson/vdec/vdec.c | 2 +
> .../staging/media/meson/vdec/vdec_platform.c | 44 +++++++++++++++++++
> .../staging/media/meson/vdec/vdec_platform.h | 2 +
> 3 files changed, 48 insertions(+)
>
> diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
> index de3e0345ab7c..5e5b296f93ba 100644
> --- a/drivers/staging/media/meson/vdec/vdec.c
> +++ b/drivers/staging/media/meson/vdec/vdec.c
> @@ -982,6 +982,8 @@ static const struct of_device_id vdec_dt_match[] = {
> .data = &vdec_platform_gxm },
> { .compatible = "amlogic,gxl-vdec",
> .data = &vdec_platform_gxl },
> + { .compatible = "amlogic,gxlx-vdec",
> + .data = &vdec_platform_gxlx },
> { .compatible = "amlogic,g12a-vdec",
> .data = &vdec_platform_g12a },
> { .compatible = "amlogic,sm1-vdec",
> diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
> index 70c9fd7c8bc5..66bb307db85a 100644
> --- a/drivers/staging/media/meson/vdec/vdec_platform.c
> +++ b/drivers/staging/media/meson/vdec/vdec_platform.c
> @@ -101,6 +101,44 @@ static const struct amvdec_format vdec_formats_gxl[] = {
> },
> };
>
> +static const struct amvdec_format vdec_formats_gxlx[] = {
> + {
> + .pixfmt = V4L2_PIX_FMT_H264,
> + .min_buffers = 2,
> + .max_buffers = 24,
> + .max_width = 3840,
> + .max_height = 2160,
> + .vdec_ops = &vdec_1_ops,
> + .codec_ops = &codec_h264_ops,
> + .firmware_path = "meson/vdec/gxl_h264.bin",
> + .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
> + .flags = V4L2_FMT_FLAG_COMPRESSED |
> + V4L2_FMT_FLAG_DYN_RESOLUTION,
> + }, {
> + .pixfmt = V4L2_PIX_FMT_MPEG1,
> + .min_buffers = 8,
> + .max_buffers = 8,
> + .max_width = 1920,
> + .max_height = 1080,
> + .vdec_ops = &vdec_1_ops,
> + .codec_ops = &codec_mpeg12_ops,
> + .firmware_path = "meson/vdec/gxl_mpeg12.bin",
> + .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
> + .flags = V4L2_FMT_FLAG_COMPRESSED,
> + }, {
> + .pixfmt = V4L2_PIX_FMT_MPEG2,
> + .min_buffers = 8,
> + .max_buffers = 8,
> + .max_width = 1920,
> + .max_height = 1080,
> + .vdec_ops = &vdec_1_ops,
> + .codec_ops = &codec_mpeg12_ops,
> + .firmware_path = "meson/vdec/gxl_mpeg12.bin",
> + .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
> + .flags = V4L2_FMT_FLAG_COMPRESSED,
> + },
> +};
> +
> static const struct amvdec_format vdec_formats_gxm[] = {
> {
> .pixfmt = V4L2_PIX_FMT_VP9,
> @@ -263,6 +301,12 @@ const struct vdec_platform vdec_platform_gxl = {
> .revision = VDEC_REVISION_GXL,
> };
>
> +const struct vdec_platform vdec_platform_gxlx = {
> + .formats = vdec_formats_gxlx,
> + .num_formats = ARRAY_SIZE(vdec_formats_gxlx),
> + .revision = VDEC_REVISION_GXLX,
> +};
> +
> const struct vdec_platform vdec_platform_gxm = {
> .formats = vdec_formats_gxm,
> .num_formats = ARRAY_SIZE(vdec_formats_gxm),
> diff --git a/drivers/staging/media/meson/vdec/vdec_platform.h b/drivers/staging/media/meson/vdec/vdec_platform.h
> index 731877a771f4..88ca4a9db8a8 100644
> --- a/drivers/staging/media/meson/vdec/vdec_platform.h
> +++ b/drivers/staging/media/meson/vdec/vdec_platform.h
> @@ -14,6 +14,7 @@ struct amvdec_format;
> enum vdec_revision {
> VDEC_REVISION_GXBB,
> VDEC_REVISION_GXL,
> + VDEC_REVISION_GXLX,
> VDEC_REVISION_GXM,
> VDEC_REVISION_G12A,
> VDEC_REVISION_SM1,
> @@ -28,6 +29,7 @@ struct vdec_platform {
> extern const struct vdec_platform vdec_platform_gxbb;
> extern const struct vdec_platform vdec_platform_gxm;
> extern const struct vdec_platform vdec_platform_gxl;
> +extern const struct vdec_platform vdec_platform_gxlx;
> extern const struct vdec_platform vdec_platform_g12a;
> extern const struct vdec_platform vdec_platform_sm1;
>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL
2024-06-04 5:15 [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Christian Hewitt
2024-06-04 5:15 ` [PATCH 2/2] media: meson: vdec: add GXLX SoC platform Christian Hewitt
2024-06-04 6:28 ` [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Krzysztof Kozlowski
@ 2024-06-07 16:05 ` Neil Armstrong
2024-06-24 8:16 ` Neil Armstrong
3 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2024-06-07 16:05 UTC (permalink / raw)
To: Christian Hewitt, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Greg Kroah-Hartman,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl, linux-media,
linux-amlogic, devicetree, linux-staging, linux-arm-kernel,
linux-kernel
On 04/06/2024 07:15, Christian Hewitt wrote:
> The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
> and S905Y as GXL chips and sort the GXL comment.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> index 55930f6107c9..47dce75aeae6 100644
> --- a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> +++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> @@ -31,7 +31,8 @@ properties:
> - items:
> - enum:
> - amlogic,gxbb-vdec # GXBB (S905)
> - - amlogic,gxl-vdec # GXL (S905X, S905D)
> + - amlogic,gxl-vdec # GXL (S905D, S905W, S905X, S905Y)
> + - amlogic,gxlx-vdec # GXLX (S905L)
> - amlogic,gxm-vdec # GXM (S912)
> - const: amlogic,gx-vdec
> - enum:
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL
2024-06-04 5:15 [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Christian Hewitt
` (2 preceding siblings ...)
2024-06-07 16:05 ` Neil Armstrong
@ 2024-06-24 8:16 ` Neil Armstrong
3 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2024-06-24 8:16 UTC (permalink / raw)
To: Christian Hewitt, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Greg Kroah-Hartman,
Kevin Hilman, Jerome Brunet, Martin Blumenstingl, linux-media,
linux-amlogic, devicetree, linux-staging, linux-arm-kernel,
linux-kernel
Dear media maintainers,
On 04/06/2024 07:15, Christian Hewitt wrote:
> The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
> and S905Y as GXL chips and sort the GXL comment.
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> index 55930f6107c9..47dce75aeae6 100644
> --- a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> +++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
> @@ -31,7 +31,8 @@ properties:
> - items:
> - enum:
> - amlogic,gxbb-vdec # GXBB (S905)
> - - amlogic,gxl-vdec # GXL (S905X, S905D)
> + - amlogic,gxl-vdec # GXL (S905D, S905W, S905X, S905Y)
> + - amlogic,gxlx-vdec # GXLX (S905L)
> - amlogic,gxm-vdec # GXM (S912)
> - const: amlogic,gx-vdec
> - enum:
Gentle ping, could this patchset be part of v6.11 ?
Thanks,
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-24 8:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-04 5:15 [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Christian Hewitt
2024-06-04 5:15 ` [PATCH 2/2] media: meson: vdec: add GXLX SoC platform Christian Hewitt
2024-06-07 16:04 ` Neil Armstrong
2024-06-04 6:28 ` [PATCH 1/2] dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL Krzysztof Kozlowski
2024-06-07 16:05 ` Neil Armstrong
2024-06-24 8:16 ` Neil Armstrong
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®