This series enable CRTC color-mgmt for komeda driver, for current komeda HW which only supports color conversion and forward gamma for CRTC.
This series actually are regrouped from: - drm/komeda: Enable layer/plane color-mgmt: https://patchwork.freedesktop.org/series/60893/
- drm/komeda: Enable CRTC color-mgmt https://patchwork.freedesktop.org/series/61370/
For removing the dependence on: - https://patchwork.freedesktop.org/series/30876/
Lowry Li (Arm Technology China) (1): drm/komeda: Adds gamma and color-transform support for DOU-IPS
james qian wang (Arm Technology China) (2): drm/komeda: Add drm_lut_to_fgamma_coeffs() drm/komeda: Add drm_ctm_to_coeffs()
.../arm/display/komeda/d71/d71_component.c | 24 ++++++ .../arm/display/komeda/komeda_color_mgmt.c | 79 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 10 ++- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 2 + .../drm/arm/display/komeda/komeda_pipeline.h | 3 + .../display/komeda/komeda_pipeline_state.c | 6 ++ 6 files changed, 123 insertions(+), 1 deletion(-)
-- 2.20.1
This function is used to convert drm 3dlut to komeda HW required 1d curve coeffs values.
Signed-off-by: james qian wang (Arm Technology China) james.qian.wang@arm.com --- .../arm/display/komeda/komeda_color_mgmt.c | 52 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 9 +++- 2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c index 9d14a92dbb17..c180ce70c26c 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c @@ -65,3 +65,55 @@ const s32 *komeda_select_yuv2rgb_coeffs(u32 color_encoding, u32 color_range)
return coeffs; } + +struct gamma_curve_sector { + u32 boundary_start; + u32 num_of_segments; + u32 segment_width; +}; + +struct gamma_curve_segment { + u32 start; + u32 end; +}; + +static struct gamma_curve_sector sector_tbl[] = { + { 0, 4, 4 }, + { 16, 4, 4 }, + { 32, 4, 8 }, + { 64, 4, 16 }, + { 128, 4, 32 }, + { 256, 4, 64 }, + { 512, 16, 32 }, + { 1024, 24, 128 }, +}; + +static void +drm_lut_to_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs, + struct gamma_curve_sector *sector_tbl, u32 num_sectors) +{ + struct drm_color_lut *lut; + u32 i, j, in, num = 0; + + if (!lut_blob) + return; + + lut = lut_blob->data; + + for (i = 0; i < num_sectors; i++) { + for (j = 0; j < sector_tbl[i].num_of_segments; j++) { + in = sector_tbl[i].boundary_start + + j * sector_tbl[i].segment_width; + + coeffs[num++] = drm_color_lut_extract(lut[in].red, + KOMEDA_COLOR_PRECISION); + } + } + + coeffs[num] = BIT(KOMEDA_COLOR_PRECISION); +} + +void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs) +{ + drm_lut_to_coeffs(lut_blob, coeffs, sector_tbl, ARRAY_SIZE(sector_tbl)); +} diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h index a2df218f58e7..08ab69281648 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h @@ -11,7 +11,14 @@ #include <drm/drm_color_mgmt.h>
#define KOMEDA_N_YUV2RGB_COEFFS 12 +#define KOMEDA_N_RGB2YUV_COEFFS 12 +#define KOMEDA_COLOR_PRECISION 12 +#define KOMEDA_N_GAMMA_COEFFS 65 +#define KOMEDA_COLOR_LUT_SIZE BIT(KOMEDA_COLOR_PRECISION) +#define KOMEDA_N_CTM_COEFFS 9 + +void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs);
const s32 *komeda_select_yuv2rgb_coeffs(u32 color_encoding, u32 color_range);
-#endif +#endif /*_KOMEDA_COLOR_MGMT_H_*/
This function is used to convert drm_color_ctm S31.32 sign-magnitude value to komeda required Q2.12 2's complement
Signed-off-by: james qian wang (Arm Technology China) james.qian.wang@arm.com --- .../arm/display/komeda/komeda_color_mgmt.c | 27 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 1 + 2 files changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c index c180ce70c26c..c92c82eebddb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c @@ -117,3 +117,30 @@ void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs) { drm_lut_to_coeffs(lut_blob, coeffs, sector_tbl, ARRAY_SIZE(sector_tbl)); } + +/* Convert from S31.32 sign-magnitude to HW Q2.12 2's complement */ +static s32 drm_ctm_s31_32_to_q2_12(u64 input) +{ + u64 mag = (input & ~BIT_ULL(63)) >> 20; + bool negative = !!(input & BIT_ULL(63)); + u32 val; + + /* the range of signed 2s complement is [-2^n, 2^n - 1] */ + val = clamp_val(mag, 0, negative ? BIT(14) : BIT(14) - 1); + + return negative ? 0 - val : val; +} + +void drm_ctm_to_coeffs(struct drm_property_blob *ctm_blob, u32 *coeffs) +{ + struct drm_color_ctm *ctm; + u32 i; + + if (!ctm_blob) + return; + + ctm = ctm_blob->data; + + for (i = 0; i < KOMEDA_N_CTM_COEFFS; i++) + coeffs[i] = drm_ctm_s31_32_to_q2_12(ctm->matrix[i]); +} diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h index 08ab69281648..2f4668466112 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h @@ -18,6 +18,7 @@ #define KOMEDA_N_CTM_COEFFS 9
void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs); +void drm_ctm_to_coeffs(struct drm_property_blob *ctm_blob, u32 *coeffs);
const s32 *komeda_select_yuv2rgb_coeffs(u32 color_encoding, u32 color_range);
Hi James,
On Mon, Sep 30, 2019 at 04:54:41AM +0000, james qian wang (Arm Technology China) wrote:
This function is used to convert drm_color_ctm S31.32 sign-magnitude value to komeda required Q2.12 2's complement
Signed-off-by: james qian wang (Arm Technology China) james.qian.wang@arm.com
.../arm/display/komeda/komeda_color_mgmt.c | 27 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 1 + 2 files changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c index c180ce70c26c..c92c82eebddb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c @@ -117,3 +117,30 @@ void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs) { drm_lut_to_coeffs(lut_blob, coeffs, sector_tbl, ARRAY_SIZE(sector_tbl)); }
+/* Convert from S31.32 sign-magnitude to HW Q2.12 2's complement */ +static s32 drm_ctm_s31_32_to_q2_12(u64 input) +{
- u64 mag = (input & ~BIT_ULL(63)) >> 20;
- bool negative = !!(input & BIT_ULL(63));
- u32 val;
- /* the range of signed 2s complement is [-2^n, 2^n - 1] */
- val = clamp_val(mag, 0, negative ? BIT(14) : BIT(14) - 1);
- return negative ? 0 - val : val;
+}
This function looks generally useful. Should it be in DRM core (assuming there isn't already one there)?
You can use a parameter to determine the number of bits desired in the output.
Thanks, -Brian
+void drm_ctm_to_coeffs(struct drm_property_blob *ctm_blob, u32 *coeffs) +{
- struct drm_color_ctm *ctm;
- u32 i;
- if (!ctm_blob)
return;- ctm = ctm_blob->data;
- for (i = 0; i < KOMEDA_N_CTM_COEFFS; i++)
coeffs[i] = drm_ctm_s31_32_to_q2_12(ctm->matrix[i]);+} diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h index 08ab69281648..2f4668466112 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h @@ -18,6 +18,7 @@ #define KOMEDA_N_CTM_COEFFS 9
void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs); +void drm_ctm_to_coeffs(struct drm_property_blob *ctm_blob, u32 *coeffs);
const s32 *komeda_select_yuv2rgb_coeffs(u32 color_encoding, u32 color_range);
-- 2.20.1
On Mon, Sep 30, 2019 at 7:05 AM Brian Starkey Brian.Starkey@arm.com wrote:
Hi James,
On Mon, Sep 30, 2019 at 04:54:41AM +0000, james qian wang (Arm Technology China) wrote:
This function is used to convert drm_color_ctm S31.32 sign-magnitude value to komeda required Q2.12 2's complement
Signed-off-by: james qian wang (Arm Technology China) james.qian.wang@arm.com
.../arm/display/komeda/komeda_color_mgmt.c | 27 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 1 + 2 files changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c index c180ce70c26c..c92c82eebddb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c @@ -117,3 +117,30 @@ void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs) { drm_lut_to_coeffs(lut_blob, coeffs, sector_tbl, ARRAY_SIZE(sector_tbl)); }
+/* Convert from S31.32 sign-magnitude to HW Q2.12 2's complement */ +static s32 drm_ctm_s31_32_to_q2_12(u64 input) +{
u64 mag = (input & ~BIT_ULL(63)) >> 20;bool negative = !!(input & BIT_ULL(63));u32 val;/* the range of signed 2s complement is [-2^n, 2^n - 1] */val = clamp_val(mag, 0, negative ? BIT(14) : BIT(14) - 1);return negative ? 0 - val : val;+}
This function looks generally useful. Should it be in DRM core (assuming there isn't already one there)?
You can use a parameter to determine the number of bits desired in the output.
I suspect every driver needs to do something similar. You can see what I did for nouveau here:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
(look for csc_drm_to_base)
Would be great to have a common helper which correctly accounts for all the variability.
Cheers,
-ilia
On Mon, Sep 30, 2019 at 07:56:13AM -0400, Ilia Mirkin wrote:
On Mon, Sep 30, 2019 at 7:05 AM Brian Starkey Brian.Starkey@arm.com wrote:
Hi James,
On Mon, Sep 30, 2019 at 04:54:41AM +0000, james qian wang (Arm Technology China) wrote:
This function is used to convert drm_color_ctm S31.32 sign-magnitude value to komeda required Q2.12 2's complement
Signed-off-by: james qian wang (Arm Technology China) james.qian.wang@arm.com
.../arm/display/komeda/komeda_color_mgmt.c | 27 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 1 + 2 files changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c index c180ce70c26c..c92c82eebddb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c @@ -117,3 +117,30 @@ void drm_lut_to_fgamma_coeffs(struct drm_property_blob *lut_blob, u32 *coeffs) { drm_lut_to_coeffs(lut_blob, coeffs, sector_tbl, ARRAY_SIZE(sector_tbl)); }
+/* Convert from S31.32 sign-magnitude to HW Q2.12 2's complement */ +static s32 drm_ctm_s31_32_to_q2_12(u64 input) +{
u64 mag = (input & ~BIT_ULL(63)) >> 20;bool negative = !!(input & BIT_ULL(63));u32 val;/* the range of signed 2s complement is [-2^n, 2^n - 1] */val = clamp_val(mag, 0, negative ? BIT(14) : BIT(14) - 1);return negative ? 0 - val : val;+}
This function looks generally useful. Should it be in DRM core (assuming there isn't already one there)?
You can use a parameter to determine the number of bits desired in the output.
I suspect every driver needs to do something similar. You can see what I did for nouveau here:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
(look for csc_drm_to_base)
Would be great to have a common helper which correctly accounts for all the variability.
Yeah the sign-bit 31.32 fixed point format is probably the most ludicrous uapi fumble we've ever done. A shared function, rolled out to drivers, to switch it to a signed 2 complements integer sounds like a _very_ good idea. -Daniel
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.
Signed-off-by: Lowry Li (Arm Technology China) lowry.li@arm.com --- .../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; 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 9ca5dbfd0723..33f7362dcc6e 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -588,6 +588,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 8401cc0cdfe7..21a50e8ce0b7 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);
dri-devel@lists.freedesktop.org
-
Brian Starkey -
Daniel Vetter -
Ilia Mirkin -
james qian wang (Arm Technology China)