On Friday, 11 October 2019 11:12:51 BST Lowry Li (Arm Technology China) wrote:
> Hi Mihail,
> On Fri, Oct 11, 2019 at 08:54:03AM +0000, Mihail Atanassov wrote:
> > Hi James, Lowry,
> >
> > On Friday, 11 October 2019 06:45:50 BST james qian wang (Arm Technology China) wrote:
> > > From: "Lowry Li (Arm Technology China)" <Lowry.Li@xxxxxxx>
> > >
> > > Adds gamma and color-transform support for DOU-IPS.
> > > Adds two caps members fgamma_coeffs and ctm_coeffs to komeda_improc_state.
> > > If color management changed, set gamma and color-transform accordingly.
> > >
> > > Signed-off-by: Lowry Li (Arm Technology China) <lowry.li@xxxxxxx>
> > > ---
> > > .../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(+)
> > >
> > > diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/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 = 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.
Fair, r-b me.
>
> Regards,
> Lowry
> > > struct komeda_improc_state *st = to_improc_st(state);
> > > + struct d71_pipeline *pipe = to_d71_pipeline(c->pipeline);
> > > u32 __iomem *reg = c->reg;
> > > u32 index;
> > > + u32 mask = 0, ctrl = 0;
> > >
> > > for_each_changed_input(state, index)
> > > malidp_write32(reg, BLK_INPUT_ID0 + index * 4,
> > > to_d71_input_id(state, index));
> > >
> > > malidp_write32(reg, BLK_SIZE, HV_SIZE(st->hsize, st->vsize));
> > > +
> > > + if (crtc_st->color_mgmt_changed) {
> > > + mask |= 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 |= 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 |= IPS_CTRL_RGB; /* enable gamut */
> > > + }
> > > + }
> > > +
> > > + if (mask)
> > > + malidp_write32_mask(reg, BLK_CONTROL, mask, ctrl);
> > > }
> > >
> > > static void d71_improc_dump(struct komeda_component *c, struct seq_file *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 *kms,
> > >
> > > crtc->port = kcrtc->master->of_output_port;
> > >
> > > + drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE);
> > > +
> > > return err;
> > > }
> > >
> > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/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 <drm/drm_atomic.h>
> > > #include <drm/drm_atomic_helper.h>
> > > #include "malidp_utils.h"
> > > +#include "komeda_color_mgmt.h"
> > >
> > > #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];
> > > };
> > >
> > > /* 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 *improc,
> > > st->hsize = dflow->in_w;
> > > st->vsize = dflow->in_h;
> > >
> > > + 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);
> > >
> > >
> >
> >
>
--
Mihail
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
