Re: [PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Hi Jacopo,
On Tue, Oct 15, 2019 at 09:17:54PM +0200, Jacopo Mondi wrote:
> On Tue, Oct 15, 2019 at 08:54:22PM +0300, Laurent Pinchart wrote:
> > On Tue, Oct 15, 2019 at 03:37:52PM +0200, Jacopo Mondi wrote:
> >> On Tue, Oct 15, 2019 at 02:15:35PM +0100, Kieran Bingham wrote:
> >>> On 15/10/2019 11:46, Jacopo Mondi wrote:
> Implement CMM handling in the crtc begin and enable atomic callbacks,
> and enable CMM unit through the Display Extensional Functions
> >>>
> >>> Extensional ?
> >>>
> >>> Perhaps this should just be Display Extension Functions?
> >>> Wow - that's actually what they call it in the data-sheet.
> >>>
> register at group setup time.
> >>>
> >>> Only a trivial extra blank line below that I can find... so
> >>>
> >>> Reviewed-by: Kieran Bingham
> >>>
> Signed-off-by: Jacopo Mondi
> ---
> drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
> drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
> drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
> 3 files changed, 89 insertions(+)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> index 23f1d6cc1719..4bc50a3f4a00 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> @@ -21,6 +21,7 @@
> #include
> #include
>
> +#include "rcar_cmm.h"
> #include "rcar_du_crtc.h"
> #include "rcar_du_drv.h"
> #include "rcar_du_encoder.h"
> @@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
> rcar_du_crtc *rcrtc)
> rcar_du_crtc_finish_page_flip(rcrtc);
> }
>
> +/*
> -
> + * Color Management Module (CMM)
> + */
> >
> > Missing blank line.
> >
> +static int rcar_du_cmm_enable(struct drm_crtc *crtc)
> +{
> +struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +
> +if (!rcrtc->cmm)
> +return 0;
> +
> +return rcar_cmm_enable(rcrtc->cmm);
> +}
> +
> +static void rcar_du_cmm_disable(struct drm_crtc *crtc)
> +{
> +struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +
> +if (!rcrtc->cmm)
> +return;
> +
> +rcar_cmm_disable(rcrtc->cmm);
> +}
> >
> > I think I would have inlined those two functions in their only call site
> > as
> >
> > if (rcrtc->cmm)
> > rcar_cmm_enable(rcrtc->cmm);
> >
> > but that's up to you.
>
> Mmm, I preferred to avoid if() in the caller, but as this is a small
> increment to an existing big driver, I'll go for the most consistent
> way
>
> +
> +static int rcar_du_cmm_check(struct drm_crtc *crtc,
> + struct drm_crtc_state *state)
> +{
> +struct drm_property_blob *drm_lut = state->gamma_lut;
> +struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +struct device *dev = rcrtc->dev->dev;
> +
> +if (!rcrtc->cmm || !drm_lut)
> +return 0;
> +
> +/* We only accept fully populated LUT tables. */
> +if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
> +drm_lut->length) {
> >
> > How about
> >
> > if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE)
> >
> > ?
>
> Better :)
>
> +dev_err(dev, "invalid gamma lut size: %lu bytes\n",
> +drm_lut->length);
> +return -EINVAL;
> +}
> +
> +return 0;
> +}
> +
> +static void rcar_du_cmm_setup(struct drm_crtc *crtc)
> +{
> +struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
> +struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +struct rcar_cmm_config cmm_config = {};
> +
> +if (!rcrtc->cmm)
> +return;
> +
> +if (drm_lut) {
> +cmm_config.lut.enable = true;
> +cmm_config.lut.table = (struct drm_color_lut
> *)drm_lut->data;
> +
> +} else {
> +cmm_config.lut.enable = false;
> +}
> >
> > This could be changed to
> >
> > if (drm_lut)
> > cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
> >
> > if we dropped the enable field.
>
> Dropping enable seems good
>
> +
> +rcar_cmm_setup(rcrtc->cmm, &cmm_config);
> +}
> +
> /*
> -
> * Start/Stop and Suspend/Resume
> */
> @@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> *rcrtc)
> if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1
Re: [PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Hi Laurent,
On Tue, Oct 15, 2019 at 08:54:22PM +0300, Laurent Pinchart wrote:
> Hi Jacopo,
>
> Thank you for the patch.
>
> On Tue, Oct 15, 2019 at 03:37:52PM +0200, Jacopo Mondi wrote:
> > On Tue, Oct 15, 2019 at 02:15:35PM +0100, Kieran Bingham wrote:
> > > On 15/10/2019 11:46, Jacopo Mondi wrote:
> > > > Implement CMM handling in the crtc begin and enable atomic callbacks,
> > > > and enable CMM unit through the Display Extensional Functions
> > >
> > > Extensional ?
> > >
> > > Perhaps this should just be Display Extension Functions?
> > > Wow - that's actually what they call it in the data-sheet.
> > >
> > > > register at group setup time.
> > >
> > > Only a trivial extra blank line below that I can find... so
> > >
> > > Reviewed-by: Kieran Bingham
> > >
> > > > Signed-off-by: Jacopo Mondi
> > > > ---
> > > > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
> > > > drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
> > > > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
> > > > 3 files changed, 89 insertions(+)
> > > >
> > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > > b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > > index 23f1d6cc1719..4bc50a3f4a00 100644
> > > > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > > @@ -21,6 +21,7 @@
> > > > #include
> > > > #include
> > > >
> > > > +#include "rcar_cmm.h"
> > > > #include "rcar_du_crtc.h"
> > > > #include "rcar_du_drv.h"
> > > > #include "rcar_du_encoder.h"
> > > > @@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
> > > > rcar_du_crtc *rcrtc)
> > > > rcar_du_crtc_finish_page_flip(rcrtc);
> > > > }
> > > >
> > > > +/*
> > > > -
> > > > + * Color Management Module (CMM)
> > > > + */
>
> Missing blank line.
>
> > > > +static int rcar_du_cmm_enable(struct drm_crtc *crtc)
> > > > +{
> > > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > > +
> > > > + if (!rcrtc->cmm)
> > > > + return 0;
> > > > +
> > > > + return rcar_cmm_enable(rcrtc->cmm);
> > > > +}
> > > > +
> > > > +static void rcar_du_cmm_disable(struct drm_crtc *crtc)
> > > > +{
> > > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > > +
> > > > + if (!rcrtc->cmm)
> > > > + return;
> > > > +
> > > > + rcar_cmm_disable(rcrtc->cmm);
> > > > +}
>
> I think I would have inlined those two functions in their only call site
> as
>
> if (rcrtc->cmm)
> rcar_cmm_enable(rcrtc->cmm);
>
> but that's up to you.
>
Mmm, I preferred to avoid if() in the caller, but as this is a small
increment to an existing big driver, I'll go for the most consistent
way
> > > > +
> > > > +static int rcar_du_cmm_check(struct drm_crtc *crtc,
> > > > +struct drm_crtc_state *state)
> > > > +{
> > > > + struct drm_property_blob *drm_lut = state->gamma_lut;
> > > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > > + struct device *dev = rcrtc->dev->dev;
> > > > +
> > > > + if (!rcrtc->cmm || !drm_lut)
> > > > + return 0;
> > > > +
> > > > + /* We only accept fully populated LUT tables. */
> > > > + if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
> > > > + drm_lut->length) {
>
> How about
>
> if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE)
>
> ?
>
Better :)
> > > > + dev_err(dev, "invalid gamma lut size: %lu bytes\n",
> > > > + drm_lut->length);
> > > > + return -EINVAL;
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static void rcar_du_cmm_setup(struct drm_crtc *crtc)
> > > > +{
> > > > + struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
> > > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > > + struct rcar_cmm_config cmm_config = {};
> > > > +
> > > > + if (!rcrtc->cmm)
> > > > + return;
> > > > +
> > > > + if (drm_lut) {
> > > > + cmm_config.lut.enable = true;
> > > > + cmm_config.lut.table = (struct drm_color_lut
> > > > *)drm_lut->data;
> > > > +
> > > > + } else {
> > > > + cmm_config.lut.enable = false;
> > > > + }
>
> This could be changed to
>
> if (drm_lut)
> cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
>
> if we dropped the enable field.
>
Dropping enable seems good
> > > > +
> > > > + rcar_cmm_setup(rcrtc->cmm, &cmm_config);
> > > > +}
> > > > +
> > > > /*
> > > > -
> > > > * Start/Stop and Suspend/Resume
> > > > */
> > > > @@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> > > > *rcrtc)
> > > > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
>
Re: [PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Hi Jacopo,
Thank you for the patch.
On Tue, Oct 15, 2019 at 03:37:52PM +0200, Jacopo Mondi wrote:
> On Tue, Oct 15, 2019 at 02:15:35PM +0100, Kieran Bingham wrote:
> > On 15/10/2019 11:46, Jacopo Mondi wrote:
> > > Implement CMM handling in the crtc begin and enable atomic callbacks,
> > > and enable CMM unit through the Display Extensional Functions
> >
> > Extensional ?
> >
> > Perhaps this should just be Display Extension Functions?
> > Wow - that's actually what they call it in the data-sheet.
> >
> > > register at group setup time.
> >
> > Only a trivial extra blank line below that I can find... so
> >
> > Reviewed-by: Kieran Bingham
> >
> > > Signed-off-by: Jacopo Mondi
> > > ---
> > > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
> > > drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
> > > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
> > > 3 files changed, 89 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > index 23f1d6cc1719..4bc50a3f4a00 100644
> > > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > > @@ -21,6 +21,7 @@
> > > #include
> > > #include
> > >
> > > +#include "rcar_cmm.h"
> > > #include "rcar_du_crtc.h"
> > > #include "rcar_du_drv.h"
> > > #include "rcar_du_encoder.h"
> > > @@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
> > > rcar_du_crtc *rcrtc)
> > > rcar_du_crtc_finish_page_flip(rcrtc);
> > > }
> > >
> > > +/*
> > > -
> > > + * Color Management Module (CMM)
> > > + */
Missing blank line.
> > > +static int rcar_du_cmm_enable(struct drm_crtc *crtc)
> > > +{
> > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > +
> > > + if (!rcrtc->cmm)
> > > + return 0;
> > > +
> > > + return rcar_cmm_enable(rcrtc->cmm);
> > > +}
> > > +
> > > +static void rcar_du_cmm_disable(struct drm_crtc *crtc)
> > > +{
> > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > +
> > > + if (!rcrtc->cmm)
> > > + return;
> > > +
> > > + rcar_cmm_disable(rcrtc->cmm);
> > > +}
I think I would have inlined those two functions in their only call site
as
if (rcrtc->cmm)
rcar_cmm_enable(rcrtc->cmm);
but that's up to you.
> > > +
> > > +static int rcar_du_cmm_check(struct drm_crtc *crtc,
> > > + struct drm_crtc_state *state)
> > > +{
> > > + struct drm_property_blob *drm_lut = state->gamma_lut;
> > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > + struct device *dev = rcrtc->dev->dev;
> > > +
> > > + if (!rcrtc->cmm || !drm_lut)
> > > + return 0;
> > > +
> > > + /* We only accept fully populated LUT tables. */
> > > + if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
> > > + drm_lut->length) {
How about
if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE)
?
> > > + dev_err(dev, "invalid gamma lut size: %lu bytes\n",
> > > + drm_lut->length);
> > > + return -EINVAL;
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static void rcar_du_cmm_setup(struct drm_crtc *crtc)
> > > +{
> > > + struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
> > > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > > + struct rcar_cmm_config cmm_config = {};
> > > +
> > > + if (!rcrtc->cmm)
> > > + return;
> > > +
> > > + if (drm_lut) {
> > > + cmm_config.lut.enable = true;
> > > + cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
> > > +
> > > + } else {
> > > + cmm_config.lut.enable = false;
> > > + }
This could be changed to
if (drm_lut)
cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
if we dropped the enable field.
> > > +
> > > + rcar_cmm_setup(rcrtc->cmm, &cmm_config);
> > > +}
> > > +
> > > /*
> > > -
> > > * Start/Stop and Suspend/Resume
> > > */
> > > @@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> > > *rcrtc)
> > > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
> > > rcar_du_vsp_disable(rcrtc);
> > >
> > > + rcar_du_cmm_disable(crtc);
> > > +
> > > /*
> > >* Select switch sync mode. This stops display operation and configures
> > >* the HSYNC and VSYNC signals as inputs.
> > > @@ -631,6 +698,7 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> > > *rcrtc)
> > > DSYSR_TVM_SWITCH);
> > >
> > > rcar_du_group_start_stop(rcrtc->group, false);
> > > +
> >
> > Extra blank line...
>
> Thanks for spotting this. I'm quite sure I run checkpatch (I just
> re-did) and not warnings for the extra white space in the previous
> patch, or this extra blank line o_0
>
> > > }
> > >
> > > /*
> > > -
Re: [PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Hi Kieran,
On Tue, Oct 15, 2019 at 02:15:35PM +0100, Kieran Bingham wrote:
> Hi Jacopo,
>
> On 15/10/2019 11:46, Jacopo Mondi wrote:
> > Implement CMM handling in the crtc begin and enable atomic callbacks,
> > and enable CMM unit through the Display Extensional Functions
>
> Extensional ?
>
> Perhaps this should just be Display Extension Functions?
> Wow - that's actually what they call it in the data-sheet.
>
> > register at group setup time.
> >
>
> Only a trivial extra blank line below that I can find... so
>
> Reviewed-by: Kieran Bingham
>
> > Signed-off-by: Jacopo Mondi
> > ---
> > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
> > drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
> > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
> > 3 files changed, 89 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > index 23f1d6cc1719..4bc50a3f4a00 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> > @@ -21,6 +21,7 @@
> > #include
> > #include
> >
> > +#include "rcar_cmm.h"
> > #include "rcar_du_crtc.h"
> > #include "rcar_du_drv.h"
> > #include "rcar_du_encoder.h"
> > @@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
> > rcar_du_crtc *rcrtc)
> > rcar_du_crtc_finish_page_flip(rcrtc);
> > }
> >
> > +/*
> > -
> > + * Color Management Module (CMM)
> > + */
> > +static int rcar_du_cmm_enable(struct drm_crtc *crtc)
> > +{
> > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > +
> > + if (!rcrtc->cmm)
> > + return 0;
> > +
> > + return rcar_cmm_enable(rcrtc->cmm);
> > +}
> > +
> > +static void rcar_du_cmm_disable(struct drm_crtc *crtc)
> > +{
> > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > +
> > + if (!rcrtc->cmm)
> > + return;
> > +
> > + rcar_cmm_disable(rcrtc->cmm);
> > +}
> > +
> > +static int rcar_du_cmm_check(struct drm_crtc *crtc,
> > +struct drm_crtc_state *state)
> > +{
> > + struct drm_property_blob *drm_lut = state->gamma_lut;
> > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > + struct device *dev = rcrtc->dev->dev;
> > +
> > + if (!rcrtc->cmm || !drm_lut)
> > + return 0;
> > +
> > + /* We only accept fully populated LUT tables. */
> > + if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
> > + drm_lut->length) {
> > + dev_err(dev, "invalid gamma lut size: %lu bytes\n",
> > + drm_lut->length);
> > + return -EINVAL;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static void rcar_du_cmm_setup(struct drm_crtc *crtc)
> > +{
> > + struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
> > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> > + struct rcar_cmm_config cmm_config = {};
> > +
> > + if (!rcrtc->cmm)
> > + return;
> > +
> > + if (drm_lut) {
> > + cmm_config.lut.enable = true;
> > + cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
> > +
> > + } else {
> > + cmm_config.lut.enable = false;
> > + }
> > +
> > + rcar_cmm_setup(rcrtc->cmm, &cmm_config);
> > +}
> > +
> > /*
> > -
> > * Start/Stop and Suspend/Resume
> > */
> > @@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> > *rcrtc)
> > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
> > rcar_du_vsp_disable(rcrtc);
> >
> > + rcar_du_cmm_disable(crtc);
> > +
> > /*
> > * Select switch sync mode. This stops display operation and configures
> > * the HSYNC and VSYNC signals as inputs.
> > @@ -631,6 +698,7 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc
> > *rcrtc)
> >DSYSR_TVM_SWITCH);
> >
> > rcar_du_group_start_stop(rcrtc->group, false);
> > +
>
> Extra blank line...
>
Thanks for spotting this. I'm quite sure I run checkpatch (I just
re-did) and not warnings for the extra white space in the previous
patch, or this extra blank line o_0
>
> > }
> >
> > /*
> > -
> > @@ -642,6 +710,11 @@ static int rcar_du_crtc_atomic_check(struct drm_crtc
> > *crtc,
> > {
> > struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(state);
> > struct drm_encoder *encoder;
> > + int ret;
> > +
> > + ret = rcar_du_cmm_check(crtc, state);
> > + if (ret)
> > + return ret;
> >
> > /* Store the routes from the CRTC output to the DU outputs. */
> > rstate->outputs = 0;
> > @@ -667,6 +740,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc
> > *crtc,
> > struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(crtc->state);
> > struct rcar_du_device *rcdu = rcrtc->dev;
> >
> > + rcar_
Re: [PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Hi Jacopo,
On 15/10/2019 11:46, Jacopo Mondi wrote:
> Implement CMM handling in the crtc begin and enable atomic callbacks,
> and enable CMM unit through the Display Extensional Functions
Extensional ?
Perhaps this should just be Display Extension Functions?
Wow - that's actually what they call it in the data-sheet.
> register at group setup time.
>
Only a trivial extra blank line below that I can find... so
Reviewed-by: Kieran Bingham
> Signed-off-by: Jacopo Mondi
> ---
> drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
> drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
> drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
> 3 files changed, 89 insertions(+)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> index 23f1d6cc1719..4bc50a3f4a00 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> @@ -21,6 +21,7 @@
> #include
> #include
>
> +#include "rcar_cmm.h"
> #include "rcar_du_crtc.h"
> #include "rcar_du_drv.h"
> #include "rcar_du_encoder.h"
> @@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
> rcar_du_crtc *rcrtc)
> rcar_du_crtc_finish_page_flip(rcrtc);
> }
>
> +/*
> -
> + * Color Management Module (CMM)
> + */
> +static int rcar_du_cmm_enable(struct drm_crtc *crtc)
> +{
> + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +
> + if (!rcrtc->cmm)
> + return 0;
> +
> + return rcar_cmm_enable(rcrtc->cmm);
> +}
> +
> +static void rcar_du_cmm_disable(struct drm_crtc *crtc)
> +{
> + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> +
> + if (!rcrtc->cmm)
> + return;
> +
> + rcar_cmm_disable(rcrtc->cmm);
> +}
> +
> +static int rcar_du_cmm_check(struct drm_crtc *crtc,
> + struct drm_crtc_state *state)
> +{
> + struct drm_property_blob *drm_lut = state->gamma_lut;
> + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> + struct device *dev = rcrtc->dev->dev;
> +
> + if (!rcrtc->cmm || !drm_lut)
> + return 0;
> +
> + /* We only accept fully populated LUT tables. */
> + if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
> + drm_lut->length) {
> + dev_err(dev, "invalid gamma lut size: %lu bytes\n",
> + drm_lut->length);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static void rcar_du_cmm_setup(struct drm_crtc *crtc)
> +{
> + struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
> + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
> + struct rcar_cmm_config cmm_config = {};
> +
> + if (!rcrtc->cmm)
> + return;
> +
> + if (drm_lut) {
> + cmm_config.lut.enable = true;
> + cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
> +
> + } else {
> + cmm_config.lut.enable = false;
> + }
> +
> + rcar_cmm_setup(rcrtc->cmm, &cmm_config);
> +}
> +
> /*
> -
> * Start/Stop and Suspend/Resume
> */
> @@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
> if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
> rcar_du_vsp_disable(rcrtc);
>
> + rcar_du_cmm_disable(crtc);
> +
> /*
>* Select switch sync mode. This stops display operation and configures
>* the HSYNC and VSYNC signals as inputs.
> @@ -631,6 +698,7 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
> DSYSR_TVM_SWITCH);
>
> rcar_du_group_start_stop(rcrtc->group, false);
> +
Extra blank line...
> }
>
> /*
> -
> @@ -642,6 +710,11 @@ static int rcar_du_crtc_atomic_check(struct drm_crtc
> *crtc,
> {
> struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(state);
> struct drm_encoder *encoder;
> + int ret;
> +
> + ret = rcar_du_cmm_check(crtc, state);
> + if (ret)
> + return ret;
>
> /* Store the routes from the CRTC output to the DU outputs. */
> rstate->outputs = 0;
> @@ -667,6 +740,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc
> *crtc,
> struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(crtc->state);
> struct rcar_du_device *rcdu = rcrtc->dev;
>
> + rcar_du_cmm_enable(crtc);
> rcar_du_crtc_get(rcrtc);
>
> /*
> @@ -686,6 +760,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc
> *crtc,
> }
>
> rcar_du_crtc_start(rcrtc);
> + rcar_du_cmm_setup(crtc);
> }
>
> static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc,
> @@ -739,6 +814,10 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc
> *crtc,
>*/
> rcar_du_c
[PATCH v5 5/8] drm: rcar-du: crtc: Control CMM operations
Implement CMM handling in the crtc begin and enable atomic callbacks,
and enable CMM unit through the Display Extensional Functions
register at group setup time.
Signed-off-by: Jacopo Mondi
---
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 79 +
drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 ++
drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++
3 files changed, 89 insertions(+)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 23f1d6cc1719..4bc50a3f4a00 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -21,6 +21,7 @@
#include
#include
+#include "rcar_cmm.h"
#include "rcar_du_crtc.h"
#include "rcar_du_drv.h"
#include "rcar_du_encoder.h"
@@ -474,6 +475,70 @@ static void rcar_du_crtc_wait_page_flip(struct
rcar_du_crtc *rcrtc)
rcar_du_crtc_finish_page_flip(rcrtc);
}
+/*
-
+ * Color Management Module (CMM)
+ */
+static int rcar_du_cmm_enable(struct drm_crtc *crtc)
+{
+ struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+
+ if (!rcrtc->cmm)
+ return 0;
+
+ return rcar_cmm_enable(rcrtc->cmm);
+}
+
+static void rcar_du_cmm_disable(struct drm_crtc *crtc)
+{
+ struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+
+ if (!rcrtc->cmm)
+ return;
+
+ rcar_cmm_disable(rcrtc->cmm);
+}
+
+static int rcar_du_cmm_check(struct drm_crtc *crtc,
+struct drm_crtc_state *state)
+{
+ struct drm_property_blob *drm_lut = state->gamma_lut;
+ struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+ struct device *dev = rcrtc->dev->dev;
+
+ if (!rcrtc->cmm || !drm_lut)
+ return 0;
+
+ /* We only accept fully populated LUT tables. */
+ if (CM2_LUT_SIZE * sizeof(struct drm_color_lut) !=
+ drm_lut->length) {
+ dev_err(dev, "invalid gamma lut size: %lu bytes\n",
+ drm_lut->length);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static void rcar_du_cmm_setup(struct drm_crtc *crtc)
+{
+ struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
+ struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+ struct rcar_cmm_config cmm_config = {};
+
+ if (!rcrtc->cmm)
+ return;
+
+ if (drm_lut) {
+ cmm_config.lut.enable = true;
+ cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
+
+ } else {
+ cmm_config.lut.enable = false;
+ }
+
+ rcar_cmm_setup(rcrtc->cmm, &cmm_config);
+}
+
/*
-
* Start/Stop and Suspend/Resume
*/
@@ -619,6 +684,8 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
rcar_du_vsp_disable(rcrtc);
+ rcar_du_cmm_disable(crtc);
+
/*
* Select switch sync mode. This stops display operation and configures
* the HSYNC and VSYNC signals as inputs.
@@ -631,6 +698,7 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
DSYSR_TVM_SWITCH);
rcar_du_group_start_stop(rcrtc->group, false);
+
}
/*
-
@@ -642,6 +710,11 @@ static int rcar_du_crtc_atomic_check(struct drm_crtc *crtc,
{
struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(state);
struct drm_encoder *encoder;
+ int ret;
+
+ ret = rcar_du_cmm_check(crtc, state);
+ if (ret)
+ return ret;
/* Store the routes from the CRTC output to the DU outputs. */
rstate->outputs = 0;
@@ -667,6 +740,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc
*crtc,
struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(crtc->state);
struct rcar_du_device *rcdu = rcrtc->dev;
+ rcar_du_cmm_enable(crtc);
rcar_du_crtc_get(rcrtc);
/*
@@ -686,6 +760,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc
*crtc,
}
rcar_du_crtc_start(rcrtc);
+ rcar_du_cmm_setup(crtc);
}
static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -739,6 +814,10 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc
*crtc,
*/
rcar_du_crtc_get(rcrtc);
+ /* If the active state changed, we let .atomic_enable handle CMM. */
+ if (crtc->state->color_mgmt_changed && !crtc->state->active_changed)
+ rcar_du_cmm_setup(crtc);
+
if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
rcar_du_vsp_atomic_begin(rcrtc);
}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c
b/drivers/gpu/drm/rcar-du/rcar_du_group.c
index 9eee47969e77..583de800a66d 100644
--- a/drivers
