lkml.org 
[lkml]   [2019]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 4/4] drm/komeda: Adds gamma and color-transform support for DOU-IPS
    Date
    From: "Lowry Li (Arm Technology China)" <Lowry.Li@arm.com>

    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.

    v5: Rebase with drm-misc-next

    Signed-off-by: Lowry Li (Arm Technology China) <lowry.li@arm.com>
    Reviewed-by: Mihail Atanassov <mihail.atanassov@arm.com>
    ---
    .../arm/display/komeda/d71/d71_component.c | 20 +++++++++++++++++++
    .../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, 31 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 f0ba26e282c3..b6517c46e670 100644
    --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
    +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
    @@ -1044,7 +1044,9 @@ 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;
    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, mask = 0, ctrl = 0;

    @@ -1055,6 +1057,24 @@ static void d71_improc_update(struct komeda_component *c,
    malidp_write32(reg, BLK_SIZE, HV_SIZE(st->hsize, st->vsize));
    malidp_write32(reg, IPS_DEPTH, st->color_depth);

    + 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 */
    + }
    + }
    +
    mask |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420;

    /* config color format */
    diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
    index 252015210fbc..1c452ea75999 100644
    --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
    +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
    @@ -617,6 +617,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 bd6ca7c87037..ac8725e24853 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
    @@ -327,6 +328,8 @@ struct komeda_improc_state {
    struct komeda_component_state base;
    u8 color_format, color_depth;
    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 42bdc63dcffa..0930234abb9d 100644
    --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
    +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
    @@ -802,6 +802,12 @@ komeda_improc_validate(struct komeda_improc *improc,
    st->color_format = BIT(__ffs(avail_formats));
    }

    + 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);

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-12 11:41    [W:3.412 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site