From: Neil Armstrong <neil.armstrong@linaro.org>
To: Christian Hewitt <christianshewitt@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org,
devicetree@vger.kernel.org, linux-staging@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] media: meson: vdec: add GXLX SoC platform
Date: Fri, 7 Jun 2024 18:04:51 +0200 [thread overview]
Message-ID: <94773a91-a845-4821-a6ee-a0be93ea49d9@linaro.org> (raw)
In-Reply-To: <20240604051533.3312944-2-christianshewitt@gmail.com>
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>
next prev parent reply other threads:[~2024-06-07 16:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
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=94773a91-a845-4821-a6ee-a0be93ea49d9@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=christianshewitt@gmail.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin.blumenstingl@googlemail.com \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.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