From: Neil Armstrong <narmstrong@baylibre.com>
To: Mathias Steiger <mathias.steiger@googlemail.com>,
linux-amlogic@lists.infradead.org
Subject: Re: drm/meson: fix green/pink color distortion from HDR set during vendor Uboot
Date: Thu, 20 May 2021 16:04:36 +0200 [thread overview]
Message-ID: <9fd1d2db-4ae7-a24d-a525-ebcd693d1dd4@baylibre.com> (raw)
In-Reply-To: <553e127c-9839-d15b-d435-c01f18c7be48@gmail.com>
Hi Mathias,
On 28/04/2021 01:11, Mathias Steiger wrote:
>
> Fixes: 728883948b0d ("drm/meson: Add G12A Support for VIU setup")
>
> Tested-by: Neil Armstrong<narmstrong@baylibre.com>
The formatting is wrong, but I'll reformat it before applying it, but I need to confirm you sign-off this patch
with something like "Signed-off: Mathias Steiger <mathias.steiger@googlemail.com>" for my to apply it.
Thanks,
Neil
>
>
> diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
> --- a/drivers/gpu/drm/meson/meson_registers.h
> +++ b/drivers/gpu/drm/meson/meson_registers.h
> @@ -634,6 +634,11 @@
> #define VPP_WRAP_OSD3_MATRIX_PRE_OFFSET2 0x3dbc
> #define VPP_WRAP_OSD3_MATRIX_EN_CTRL 0x3dbd
>
> +/* osd1 HDR */
> +#define OSD1_HDR2_CTRL 0x38a0
> +#define OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN BIT(13)
> +#define OSD1_HDR2_CTRL_REG_ONLY_MAT BIT(16)
> +
> /* osd2 scaler */
> #define OSD2_VSC_PHASE_STEP 0x3d00
> #define OSD2_VSC_INI_PHASE 0x3d01
> diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
> --- a/drivers/gpu/drm/meson/meson_viu.c
> +++ b/drivers/gpu/drm/meson/meson_viu.c
> @@ -426,8 +426,14 @@ void meson_viu_init(struct meson_drm *priv)
> meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL))
> meson_viu_load_matrix(priv);
> else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
> + {
> meson_viu_set_g12a_osd1_matrix(priv, RGB709_to_YUV709l_coeff,
> true);
> + /* fix green/pink color distortion from vendor uboot */
> + writel_bits_relaxed(OSD1_HDR2_CTRL_REG_ONLY_MAT |
> + OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN, 0,
> + priv->io_base + _REG(OSD1_HDR2_CTRL));
> + }
>
> /* Initialize OSD1 fifo control register */
> reg = VIU_OSD_DDR_PRIORITY_URGENT |
>
>
> _______________________________________________
> linux-amlogic mailing list
> linux-amlogic@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2021-05-20 14:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 23:11 drm/meson: fix green/pink color distortion from HDR set during vendor Uboot Mathias Steiger
2021-05-20 14:04 ` Neil Armstrong [this message]
2021-07-29 4:21 Philip Milev
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=9fd1d2db-4ae7-a24d-a525-ebcd693d1dd4@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=mathias.steiger@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.