drm/komeda: Enable CRTC color-mgmt
Subsystems (4)
v7 cover drm/komeda: Enable CRTC color-mgmt
Hi:
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) (3):
drm/komeda: Add a new helper drm_color_ctm_s31_32_to_qm_n() drm/komeda: Add drm_lut_to_fgamma_coeffs() drm/komeda: Add drm_ctm_to_coeffs()
v2:
Move the fixpoint conversion function s31_32_to_q2_12() to drm core as a shared helper.
v4:
Address review comments from Mihai, Daniel and Ilia.
V5:
- Includes the sign bit in the value of m (Qm.n).
- Rebase with drm-misc-next
v6:
Allows m == 0 according to Mihail's comments.
Lowry Li (Arm Technology China) (1):
drm/komeda: Adds gamma and color-transform support for DOU-IPS
james qian wang (Arm Technology China) (3):
drm: Add a new helper drm_color_ctm_s31_32_to_qm_n() drm/komeda: Add drm_lut_to_fgamma_coeffs() drm/komeda: Add drm_ctm_to_coeffs()
.../arm/display/komeda/d71/d71_component.c | 20 ++++++ .../arm/display/komeda/komeda_color_mgmt.c | 66 +++++++++++++++++++ .../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 ++ drivers/gpu/drm/drm_color_mgmt.c | 36 ++++++++++ include/drm/drm_color_mgmt.h | 2 + 8 files changed, 144 insertions(+), 1 deletion(-)
--
2.20.1
PATCH v7 1/4 drm: Add a new helper drm_color_ctm_s31_32_to_qm_n()
Add a new helper function drm_color_ctm_s31_32_to_qm_n() for driver to convert S31.32 sign-magnitude to Qm.n 2's complement that supported by hardware.
V4: Address Mihai, Daniel and Ilia's review comments.
V5: Includes the sign bit in the value of m (Qm.n).
V6: Allows m = 0 according to Mihail's comments.
V6: Address Mihail's comments.
--- drivers/gpu/drm/drm_color_mgmt.c | 36 ++++++++++++++++++++++++++++++++ include/drm/drm_color_mgmt.h | 2 ++ 2 files changed, 38 insertions(+)
drivers/gpu/drm/drm_color_mgmt.c +36 -0
@@ -132,6 +132,42 @@ uint32_t drm_color_lut_extract(uint32_t user_input, uint32_t bit_precision) }EXPORT_SYMBOL (drm_color_lut_extract); +/** +* drm_color_ctm_s31_32_to_qm_n +* +* @user_input: input value +* @m: number of integer bits, only support m <= 32, include the sign-bit +* @n: number of fractional bits, only support n <= 32 +* +* Convert and clamp S31.32 sign-magnitude to Qm.n (signed 2's complement). +* The sign-bit BIT(m+n) and above are 0 for positive value and 1 for negative. +* the range of value is [-2^(m-1), 2^(m-1) - 2^-n] +* +* For example +* A Q3.12 format number: +* - required bit: 3 + 12 = 15bits +* - range: [-2^2, 2^2 - 2^−15] +* +* NOTE: the m can be zero if all bit_precision are used to present fractional +* bits like Q0.32 +*/ +uint64_t drm_color_ctm_s31_32_to_qm_n (uint64_t user_input, +uint32_t m,uint32_t n) +{ +u64 mag = (user_input & ~BIT_ULL (63 )) >> (32 - n); +bool negative = !!(user_input &BIT_ULL (63 )); +s64 val; + +WARN_ON (m >32 || n >32 ); + + + val =clamp_val (mag,0 , negative ? +BIT_ULL (n + m -1 ) :BIT_ULL (n + m -1 ) -1 ); + +return negative ? -val : val; +} +EXPORT_SYMBOL (drm_color_ctm_s31_32_to_qm_n); +/** * drm_crtc_enable_color_mgmt - enable color management properties * @crtc: DRM CRTC
include/drm/drm_color_mgmt.h +2 -0
@@ -30,6 +30,8 @@ struct drm_crtc;struct drm_plane ;uint32_t drm_color_lut_extract (uint32_t user_input,uint32_t bit_precision); +uint64_t drm_color_ctm_s31_32_to_qm_n (uint64_t user_input, +uint32_t m,uint32_t n); void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, uint degamma_lut_size,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 1/4] drm: Add a new helper drm_color_ctm_s31_32_to_qm_n()
Hi James,
You already have my r-b on the patch, so for posterity: no further important comments from my side.
Quoted 24 lines · On Wednesday, 23 October 2019 07:42:55 BST james qian wang (Arm Technology…
Add a new helper function
drm_color_ctm_s31_32_to_qm_n()for driver to convert S31.32 sign-magnitude to Qm.n 2's complement that supported by hardware.V4: Address Mihai, Daniel and Ilia's review comments.
V5: Includes the sign bit in the value of m (Qm.n).
V6: Allows m = 0 according to Mihail's comments.
V6: Address Mihail's comments.Reviewed-by Mihail Atanassov <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_color_mgmt.c | 36 ++++++++++++++++++++++++++++++++ include/drm/drm_color_mgmt.h | 2 ++ 2 files changed, 38 insertions(+)drivers/gpu/drm/drm_color_mgmt.c +0
-0@@ -132,6 +132,42 @@ uint32_t drm_color_lut_extract(uint32_t user_input, uint32_t bit_precision) }EXPORT_SYMBOL (drm_color_lut_extract);
drivers/gpu/drm/drm_color_mgmt.c uint32_t drm_color_lut_extract(uint32_t user_input, uint32_t bit_precision) · line 143
Quoted 10 lines
drivers/gpu/drm/drm_color_mgmt.c +9
-0+/** +* drm_color_ctm_s31_32_to_qm_n +* +* @user_input: input value +* @m: number of integer bits, only support m <= 32, include the sign-bit +* @n: number of fractional bits, only support n <= 32 +* +* Convert and clamp S31.32 sign-magnitude to Qm.n (signed 2's complement). +* The sign-bit BIT(m+n) and above are 0 for positive value and 1 for negative.
[really pedantic] m+n-1 :)
Quoted 47 lines
drivers/gpu/drm/drm_color_mgmt.c +27
-0+* the range of value is [-2^(m-1), 2^(m-1) - 2^-n] +* +* For example +* A Q3.12 format number: +* - required bit: 3 + 12 = 15bits +* - range: [-2^2, 2^2 - 2^−15] +* +* NOTE: the m can be zero if all bit_precision are used to present fractional +* bits like Q0.32 +*/ +uint64_t drm_color_ctm_s31_32_to_qm_n (uint64_t user_input, +uint32_t m,uint32_t n) +{ +u64 mag = (user_input & ~BIT_ULL (63 )) >> (32 - n); +bool negative = !!(user_input &BIT_ULL (63 )); +s64 val; + +WARN_ON (m >32 || n >32 ); + + + val =clamp_val (mag,0 , negative ? +BIT_ULL (n + m -1 ) :BIT_ULL (n + m -1 ) -1 ); + +return negative ? -val : val; +} +EXPORT_SYMBOL (drm_color_ctm_s31_32_to_qm_n); +/** * drm_crtc_enable_color_mgmt - enable color management properties * @crtc: DRM CRTC include/drm/drm_color_mgmt.h +2
-0@@ -30,6 +30,8 @@ struct drm_crtc;struct drm_plane ;uint32_t drm_color_lut_extract (uint32_t user_input,uint32_t bit_precision); +uint64_t drm_color_ctm_s31_32_to_qm_n (uint64_t user_input, +uint32_t m,uint32_t n); void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc, uint degamma_lut_size,Signature · 1 line
2.20.1
Signature · 8 lines
Mihail _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 2/4 drm/komeda: Add drm_lut_to_fgamma_coeffs()
In reply to james qian wang (Arm Technology China)This function is used to convert drm color lut to komeda HW required curve coeffs values.
--- .../arm/display/komeda/komeda_color_mgmt.c | 52 +++++++++++++++++++ .../arm/display/komeda/komeda_color_mgmt.h | 9 +++- 2 files changed, 60 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +52 -0
@@ -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)); +}
drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h +8 -1
@@ -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_*/
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 3/4 drm/komeda: Add drm_ctm_to_coeffs()
In reply to james qian wang (Arm Technology China)This function is for converting drm_color_ctm matrix to komeda hardware required required Q2.12 2's complement CSC matrix.
v2:
Move the fixpoint conversion function s31_32_to_q2_12() to drm core as a shared helper.
--- .../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 14 ++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 1 + 2 files changed, 15 insertions(+)
drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c +14 -0
@@ -117,3 +117,17 @@ 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)); } + +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_color_ctm_s31_32_to_qm_n (ctm->matrix[i],3 ,12 ); +}
drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h +1 -0
@@ -18,6 +18,7 @@#define KOMEDA_N_CTM_COEFFS 9void 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);
Signature · 1 line
2.20.1
PATCH v7 4/4 drm/komeda: Adds gamma and color-transform support for DOU-IPS
In reply to james qian wang (Arm Technology China)From: "Lowry Li (Arm Technology China)" <[email protected]>
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
--- .../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(+)
drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +20 -0
@@ -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 */
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -0
@@ -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; }
drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +3 -0
@@ -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 */
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +6 -0
@@ -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 );
Signature · 1 line
2.20.1