From: "Lowry Li (Arm Technology China)" Subject: Re: [PATCH v2 4/4] drm/komeda: Adds gamma and color-transform support for DOU-IPS Date: Fri, 11 Oct 2019 10:12:51 +0000 Message-ID: <20191011101244.GA13428@lowli01-ThinkStation-P300> References: <20191011054459.17984-1-james.qian.wang@arm.com> <20191011054459.17984-5-james.qian.wang@arm.com> <8416585.jh9292Gg6g@e123338-lin> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <8416585.jh9292Gg6g@e123338-lin> Content-Language: en-US Content-ID: <0243169099F92A47A256B1BECB486C33@eurprd08.prod.outlook.com> Sender: linux-kernel-owner@vger.kernel.org To: Mihail Atanassov Cc: "james qian wang (Arm Technology China)" , Liviu Dudau , "airlied@linux.ie" , Brian Starkey , "maarten.lankhorst@linux.intel.com" , "sean@poorly.run" , "imirkin@alum.mit.edu" , "Jonathan Chai (Arm Technology China)" , "Julien Yin (Arm Technology China)" , "Thomas Sun (Arm Technology China)" , Ayan Halder , "Tiannan Zhu (Arm Technology China)" , "Yiqi Kang (Arm Technology China)" , nd , "linux-kernel@vger.kernel.org" , dri-devel@lists.f List-Id: dri-devel@lists.freedesktop.org Hi Mihail, On Fri, Oct 11, 2019 at 08:54:03AM +0000, Mihail Atanassov wrote: > Hi James, Lowry, >=20 > On Friday, 11 October 2019 06:45:50 BST james qian wang (Arm Technology C= hina) wrote: > > From: "Lowry Li (Arm Technology China)" > >=20 > > Adds gamma and color-transform support for DOU-IPS. > > Adds two caps members fgamma_coeffs and ctm_coeffs to komeda_improc_sta= te. > > If color management changed, set gamma and color-transform accordingly. > >=20 > > Signed-off-by: Lowry Li (Arm Technology China) > > --- > > .../arm/display/komeda/d71/d71_component.c | 24 +++++++++++++++++++ > > .../gpu/drm/arm/display/komeda/komeda_crtc.c | 2 ++ > > .../drm/arm/display/komeda/komeda_pipeline.h | 3 +++ > > .../display/komeda/komeda_pipeline_state.c | 6 +++++ > > 4 files changed, 35 insertions(+) > >=20 > > diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/d= rivers/gpu/drm/arm/display/komeda/d71/d71_component.c > > index c3d29c0b051b..e7e5a8e4430e 100644 > > --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c > > +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c > > @@ -942,15 +942,39 @@ static int d71_merger_init(struct d71_dev *d71, > > static void d71_improc_update(struct komeda_component *c, > > struct komeda_component_state *state) > > { > > + struct drm_crtc_state *crtc_st =3D state->crtc->state; > I'm not sure it's a good idea to introduce a dependency on drm state > so far down in the HW funcs, is there a good reason for the direct prod? We dicussed about this before. To decide using this way is to avoid of duplicated state between DRM and Komeda. Regards, Lowry > > struct komeda_improc_state *st =3D to_improc_st(state); > > + struct d71_pipeline *pipe =3D to_d71_pipeline(c->pipeline); > > u32 __iomem *reg =3D c->reg; > > u32 index; > > + u32 mask =3D 0, ctrl =3D 0; > > =20 > > for_each_changed_input(state, index) > > malidp_write32(reg, BLK_INPUT_ID0 + index * 4, > > to_d71_input_id(state, index)); > > =20 > > malidp_write32(reg, BLK_SIZE, HV_SIZE(st->hsize, st->vsize)); > > + > > + if (crtc_st->color_mgmt_changed) { > > + mask |=3D IPS_CTRL_FT | IPS_CTRL_RGB; > > + > > + if (crtc_st->gamma_lut) { > > + malidp_write_group(pipe->dou_ft_coeff_addr, FT_COEFF0, > > + KOMEDA_N_GAMMA_COEFFS, > > + st->fgamma_coeffs); > > + ctrl |=3D IPS_CTRL_FT; /* enable gamma */ > > + } > > + > > + if (crtc_st->ctm) { > > + malidp_write_group(reg, IPS_RGB_RGB_COEFF0, > > + KOMEDA_N_CTM_COEFFS, > > + st->ctm_coeffs); > > + ctrl |=3D IPS_CTRL_RGB; /* enable gamut */ > > + } > > + } > > + > > + if (mask) > > + malidp_write32_mask(reg, BLK_CONTROL, mask, ctrl); > > } > > =20 > > static void d71_improc_dump(struct komeda_component *c, struct seq_fil= e *sf) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers= /gpu/drm/arm/display/komeda/komeda_crtc.c > > index 9beeda04818b..406b9d0ca058 100644 > > --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > > @@ -590,6 +590,8 @@ static int komeda_crtc_add(struct komeda_kms_dev *k= ms, > > =20 > > crtc->port =3D kcrtc->master->of_output_port; > > =20 > > + drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE); > > + > > return err; > > } > > =20 > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/dri= vers/gpu/drm/arm/display/komeda/komeda_pipeline.h > > index b322f52ba8f2..c5ab8096c85d 100644 > > --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h > > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h > > @@ -11,6 +11,7 @@ > > #include > > #include > > #include "malidp_utils.h" > > +#include "komeda_color_mgmt.h" > > =20 > > #define KOMEDA_MAX_PIPELINES 2 > > #define KOMEDA_PIPELINE_MAX_LAYERS 4 > > @@ -324,6 +325,8 @@ struct komeda_improc { > > struct komeda_improc_state { > > struct komeda_component_state base; > > u16 hsize, vsize; > > + u32 fgamma_coeffs[KOMEDA_N_GAMMA_COEFFS]; > > + u32 ctm_coeffs[KOMEDA_N_CTM_COEFFS]; > > }; > > =20 > > /* display timing controller */ > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c= b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c > > index 0ba9c6aa3708..4a40b37eb1a6 100644 > > --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c > > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c > > @@ -756,6 +756,12 @@ komeda_improc_validate(struct komeda_improc *impro= c, > > st->hsize =3D dflow->in_w; > > st->vsize =3D dflow->in_h; > > =20 > > + if (kcrtc_st->base.color_mgmt_changed) { > > + drm_lut_to_fgamma_coeffs(kcrtc_st->base.gamma_lut, > > + st->fgamma_coeffs); > > + drm_ctm_to_coeffs(kcrtc_st->base.ctm, st->ctm_coeffs); > > + } > > + > > komeda_component_add_input(&st->base, &dflow->input, 0); > > komeda_component_set_output(&dflow->input, &improc->base, 0); > > =20 > >=20 >=20 >=20 > --=20 > Mihail >=20 >=20