public inbox for devicetree@vger.kernel.org
 help / color / mirror / Atom feed
From: "Jernej Škrabec" <jernej.skrabec-gGgVlfcn5nU@public.gmane.org>
To: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	icenowy-h8G6r0blFSE@public.gmane.org
Cc: Maxime Ripard
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [RFC PATCH 06/11] drm: sun4i: add color space correction support for DE2 mixer
Date: Wed, 17 May 2017 22:14:35 +0200	[thread overview]
Message-ID: <3168098.MulOhl7Yb4@jernej-laptop> (raw)
In-Reply-To: <20170517164354.16399-7-icenowy-h8G6r0blFSE@public.gmane.org>

Hi,

Dne sreda, 17. maj 2017 ob 18:43:49 CEST je Icenowy Zheng napisal(a):
> The DE2 mixer can do color space correction needed by TV Encoder with
> its DCSC sub-engine.
> 
> Add support for it.
> 
> Signed-off-by: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>
> ---
>  drivers/gpu/drm/sun4i/sun8i_mixer.c | 35
> +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 
> 6 +++++-
>  2 files changed, 40 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> b/drivers/gpu/drm/sun4i/sun8i_mixer.c index d658a3a8159a..65f86641eca3
> 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> @@ -29,6 +29,14 @@
>  #include "sun8i_layer.h"
>  #include "sunxi_engine.h"
> 
> +static const u32 sun8i_rgb2yuv_coef[12] = {
> +	0x00000107, 0x00000204, 0x00000064, 0x00004200,
> +	0x00001f68, 0x00001ed6, 0x000001c2, 0x00020200,
> +	0x000001c2, 0x00001e87, 0x00001fb7, 0x00020200,
> +};
> +
> +static const u32 sun8i_rgb2yuv_dcsc_alpha = 0x00020200;
> +

There is no need to set/use alpha. BSP code doesn't set it and 0x00020200 
value is default.

Best regards,
Jernej

>  static void sun8i_mixer_commit(struct sunxi_engine *engine)
>  {
>  	DRM_DEBUG_DRIVER("Committing changes\n");
> @@ -37,6 +45,31 @@ static void sun8i_mixer_commit(struct sunxi_engine
> *engine) SUN8I_MIXER_GLOBAL_DBUFF_ENABLE);
>  }
> 
> +static void sun8i_mixer_apply_color_correction(struct sunxi_engine *engine)
> +{
> +	int i;
> +
> +	DRM_DEBUG_DRIVER("Applying RGB to YUV color correction\n");
> +
> +	/* Set color correction */
> +	regmap_write(engine->regs, SUN8I_MIXER_DCSC_EN, 1);
> +
> +	for (i = 0; i < 12; i++)
> +		regmap_write(engine->regs, SUN8I_MIXER_DCSC_COEF_REG(i),
> +			     sun8i_rgb2yuv_coef[i]);
> +
> +	regmap_write(engine->regs, SUN8I_MIXER_DCSC_COEF_ALPHA,
> +		     sun8i_rgb2yuv_dcsc_alpha);
> +}
> +
> +static void sun8i_mixer_disable_color_correction(struct sunxi_engine
> *engine) +{
> +	DRM_DEBUG_DRIVER("Disabling color correction\n");
> +
> +	/* Disable color correction */
> +	regmap_write(engine->regs, SUN8I_MIXER_DCSC_EN, 0);
> +}
> +
>  void sun8i_mixer_layer_enable(struct sun8i_mixer *mixer,
>  				int layer, bool enable)
>  {
> @@ -229,6 +262,8 @@ int sun8i_mixer_update_layer_buffer(struct sun8i_mixer
> *mixer, static const struct sunxi_engine_ops sun8i_engine_ops = {
>  	.commit		= sun8i_mixer_commit,
>  	.layers_init	= sun8i_layers_init,
> +	.apply_color_correction		= sun8i_mixer_apply_color_correction,
> +	.disable_color_correction	= sun8i_mixer_disable_color_correction,
>  };
> 
>  static struct regmap_config sun8i_mixer_regmap_config = {
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h
> b/drivers/gpu/drm/sun4i/sun8i_mixer.h index 4785ac090b8c..d7f7513898b6
> 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
> @@ -88,6 +88,11 @@
>  #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_RGB888	(8 << 8)
>  #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_DEF	(0xff << 24)
> 
> +/* The DCSC sub-engine is used to do color space conversation */
> +#define SUN8I_MIXER_DCSC_EN			0xb0000
> +#define SUN8I_MIXER_DCSC_COEF_REG(x)		(0xb0010 + 0x4 * x)
> +#define SUN8I_MIXER_DCSC_COEF_ALPHA		0xb0040
> +
>  /*
>   * These sub-engines are still unknown now, the EN registers are here only
> to * be used to disable these sub-engines.
> @@ -102,7 +107,6 @@
>  #define SUN8I_MIXER_PEAK_EN			0xa6000
>  #define SUN8I_MIXER_ASE_EN			0xa8000
>  #define SUN8I_MIXER_FCC_EN			0xaa000
> -#define SUN8I_MIXER_DCSC_EN			0xb0000
> 
>  struct sun8i_mixer_cfg {
>  	int		vi_num;
> --
> 2.12.2
> 
> --
> You received this message because you are subscribed to the Google Groups
> "linux-sunxi" group. To unsubscribe from this group and stop receiving
> emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
> For more options, visit https://groups.google.com/d/optout.

  parent reply	other threads:[~2017-05-17 20:14 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-17 16:43 [RFC PATCH 00/11] Support for H3 Composite Output support Icenowy Zheng
     [not found] ` <20170517164354.16399-1-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-17 16:43   ` [RFC PATCH 01/11] dt-bindings: update the binding for Allwinner H3 TVE support Icenowy Zheng
     [not found]     ` <20170517164354.16399-2-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-19 18:02       ` Maxime Ripard
     [not found]         ` <20170519180215.7lc7duueu74pt4kz-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-19 18:06           ` Icenowy Zheng
     [not found]             ` <ED64A56C-4FD3-4878-B67E-1501F20C7B8D-h8G6r0blFSE@public.gmane.org>
2017-05-20  2:01               ` Chen-Yu Tsai
2017-05-17 16:43   ` [RFC PATCH 02/11] drm: sun4i: add support for H3 mixers Icenowy Zheng
     [not found]     ` <20170517164354.16399-3-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-19 17:47       ` Maxime Ripard
     [not found]         ` <20170519174729.q5qk2vqlibzx3zrv-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-19 17:49           ` Icenowy Zheng
     [not found]             ` <695DFDD0-1925-433C-AB88-B90EE461C203-h8G6r0blFSE@public.gmane.org>
2017-05-19 18:00               ` Jernej Škrabec
2017-05-17 16:43   ` [RFC PATCH 03/11] drm: sun4i: ignore swapped mixer<->tcon connection for DE2 Icenowy Zheng
     [not found]     ` <20170517164354.16399-4-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-19 17:57       ` Maxime Ripard
     [not found]         ` <20170519175753.sygqnwopk7tuv35n-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-19 18:00           ` Icenowy Zheng
     [not found]             ` <ECF29F56-DF18-4E3C-9C85-B29F89BD4228-h8G6r0blFSE@public.gmane.org>
2017-05-24  8:14               ` Maxime Ripard
2017-06-04 14:19                 ` icenowy
2017-05-17 16:43   ` [RFC PATCH 04/11] drm: sun4i: add support for H3's TCON0/1 Icenowy Zheng
2017-05-17 16:43   ` [RFC PATCH 05/11] drm: sun4i: add compatible for H3 display engine Icenowy Zheng
2017-05-17 16:43   ` [RFC PATCH 06/11] drm: sun4i: add color space correction support for DE2 mixer Icenowy Zheng
     [not found]     ` <20170517164354.16399-7-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-17 20:14       ` Jernej Škrabec [this message]
2017-05-17 16:43   ` [RFC PATCH 07/11] drm: sun4i: add support for the TV encoder in H3 SoC Icenowy Zheng
     [not found]     ` <20170517164354.16399-8-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-19 18:03       ` Maxime Ripard
     [not found]         ` <20170519180330.7hpfkdqk3r2x3kn5-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-19 18:08           ` Icenowy Zheng
     [not found]             ` <3FCDBC05-20A1-460C-A21B-8C3E9C776768-h8G6r0blFSE@public.gmane.org>
2017-05-19 18:23               ` Jernej Škrabec
2017-05-20  1:37                 ` Chen-Yu Tsai
     [not found]                   ` <CAGb2v66aD=G+V75N-_nYo=dGqhxpKhadM84h9G-B34=dnDwCbg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-22 17:55                     ` Jernej Škrabec
2017-05-23 12:53                       ` Maxime Ripard
2017-05-23 12:56                         ` [linux-sunxi] " Icenowy Zheng
2017-05-23 13:00                         ` icenowy
     [not found]                           ` <98c3572beee0a81755994b4bdc508b18-h8G6r0blFSE@public.gmane.org>
2017-05-24  7:30                             ` Maxime Ripard
     [not found]                               ` <20170524073019.bl6rojc2srrigalp-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-24  8:25                                 ` [linux-sunxi] " Icenowy Zheng
     [not found]                                   ` <98558BA2-BC99-4D0A-A045-571C643875C5-h8G6r0blFSE@public.gmane.org>
2017-05-24 15:23                                     ` Jernej Škrabec
2017-05-31 18:43                                     ` Maxime Ripard
     [not found]                                       ` <20170531184306.hzu2em35vr4qi4un-ZC1Zs529Oq4@public.gmane.org>
2017-06-01 14:11                                         ` icenowy-h8G6r0blFSE
     [not found]                                           ` <715e6ab52d8aa0032c9759393ace20dc-h8G6r0blFSE@public.gmane.org>
2017-06-02 22:21                                             ` Maxime Ripard
2017-06-04 14:29                               ` [linux-sunxi] " icenowy
     [not found]                                 ` <861ead704cc7d1bc0983d0f01138f190-h8G6r0blFSE@public.gmane.org>
2017-06-07  7:58                                   ` Maxime Ripard
2017-05-17 16:43   ` [RFC PATCH 08/11] clk: sunxi-ng: allow CLK_DE to set CLK_PLL_DE for H3 Icenowy Zheng
2017-05-17 16:43   ` [RFC PATCH 09/11] clk: sunxi-ng: export " Icenowy Zheng
2017-05-17 16:43   ` [RFC PATCH 10/11] ARM: sun8i: h3: add display engine pipeline for TVE Icenowy Zheng
     [not found]     ` <20170517164354.16399-11-icenowy-h8G6r0blFSE@public.gmane.org>
2017-05-17 20:19       ` [linux-sunxi] " Jernej Škrabec
2017-05-19 18:06       ` Maxime Ripard
     [not found]         ` <20170519180616.vzrlu2avuucsjkiu-YififvaboMKzQB+pC5nmwQ@public.gmane.org>
2017-05-19 18:10           ` Icenowy Zheng
2017-05-24  8:19             ` [linux-sunxi] " Maxime Ripard
2017-05-24  5:24       ` Chen-Yu Tsai
     [not found]         ` <CAGb2v64nVA=hHjXkVNMN68vQizMBE6vyYfaE895b0L6umv_Ycw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-24  5:28           ` [linux-sunxi] " Icenowy Zheng
     [not found]             ` <299627EE-8D9C-451A-9F74-0C5037D19DCC-h8G6r0blFSE@public.gmane.org>
2017-05-24  5:34               ` Chen-Yu Tsai
     [not found]                 ` <CAGb2v64-3TYDgCBhGFNDqvoTa1ch=j3k__rnbB80dsFQn3JsKw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-24  5:36                   ` Icenowy Zheng
2017-05-17 16:43   ` [RFC PATCH 11/11] [DO NOT MERGE] ARM: sun8i: h3: enable TV output on Orange Pi PC Icenowy Zheng

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=3168098.MulOhl7Yb4@jernej-laptop \
    --to=jernej.skrabec-gggvlfcn5nu@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=icenowy-h8G6r0blFSE@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=wens-jdAy2FN1RRM@public.gmane.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