[PATCH 36/36] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG
Harry Wentland
harry.wentland at amd.com
Fri Jun 2 15:10:12 UTC 2023
On 5/23/23 18:15, Melissa Wen wrote:
> From: Joshua Ashton <joshua at froggi.es>
>
> Need to funnel the color caps through to these functions so it can check
> that the hardware is capable.
>
> Signed-off-by: Joshua Ashton <joshua at froggi.es>
> Signed-off-by: Melissa Wen <mwen at igalia.com>
> ---
> .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 35 ++++++++++++-------
> 1 file changed, 23 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
> index 4a2b66568451..714f07bb9c9c 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
> @@ -338,6 +338,7 @@ static int amdgpu_dm_set_atomic_regamma(struct dc_stream_state *stream,
> /**
> * __set_input_tf - calculates the input transfer function based on expected
> * input space.
> + * @caps: dc color capabilities
> * @func: transfer function
> * @lut: lookup table that defines the color space
> * @lut_size: size of respective lut.
> @@ -345,7 +346,7 @@ static int amdgpu_dm_set_atomic_regamma(struct dc_stream_state *stream,
> * Returns:
> * 0 in case of success. -ENOMEM if fails.
> */
> -static int __set_input_tf(struct dc_transfer_func *func,
> +static int __set_input_tf(struct dc_color_caps *caps, struct dc_transfer_func *func,
> const struct drm_color_lut *lut, uint32_t lut_size)
> {
> struct dc_gamma *gamma = NULL;
> @@ -362,7 +363,7 @@ static int __set_input_tf(struct dc_transfer_func *func,
> __drm_lut_to_dc_gamma(lut, gamma, false);
> }
>
> - res = mod_color_calculate_degamma_params(NULL, func, gamma, gamma != NULL);
> + res = mod_color_calculate_degamma_params(caps, func, gamma, gamma != NULL);
>
> if (gamma)
> dc_gamma_release(&gamma);
> @@ -511,7 +512,7 @@ static int amdgpu_dm_atomic_blend_lut(const struct drm_color_lut *blend_lut,
> func_blend->tf = tf;
> func_blend->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE;
>
> - ret = __set_input_tf(func_blend, blend_lut, blend_size);
> + ret = __set_input_tf(NULL, func_blend, blend_lut, blend_size);
> } else {
> func_blend->type = TF_TYPE_BYPASS;
> func_blend->tf = TRANSFER_FUNCTION_LINEAR;
> @@ -818,7 +819,8 @@ int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state *crtc,
>
> static int
> map_crtc_degamma_to_dc_plane(struct dm_crtc_state *crtc,
> - struct dc_plane_state *dc_plane_state)
> + struct dc_plane_state *dc_plane_state,
> + struct dc_color_caps *caps)
> {
> const struct drm_color_lut *degamma_lut;
> enum dc_transfer_func_predefined tf = TRANSFER_FUNCTION_SRGB;
> @@ -873,7 +875,7 @@ map_crtc_degamma_to_dc_plane(struct dm_crtc_state *crtc,
> dc_plane_state->in_transfer_func->tf =
> TRANSFER_FUNCTION_LINEAR;
>
> - r = __set_input_tf(dc_plane_state->in_transfer_func,
> + r = __set_input_tf(caps, dc_plane_state->in_transfer_func,
> degamma_lut, degamma_size);
> if (r)
> return r;
> @@ -886,7 +888,7 @@ map_crtc_degamma_to_dc_plane(struct dm_crtc_state *crtc,
> dc_plane_state->in_transfer_func->tf = tf;
>
> if (tf != TRANSFER_FUNCTION_SRGB &&
> - !mod_color_calculate_degamma_params(NULL,
> + !mod_color_calculate_degamma_params(caps,
> dc_plane_state->in_transfer_func,
> NULL, false))
> return -ENOMEM;
> @@ -897,7 +899,8 @@ map_crtc_degamma_to_dc_plane(struct dm_crtc_state *crtc,
>
> static int
> __set_dm_plane_degamma(struct drm_plane_state *plane_state,
> - struct dc_plane_state *dc_plane_state)
> + struct dc_plane_state *dc_plane_state,
> + struct dc_color_caps *color_caps)
> {
> struct dm_plane_state *dm_plane_state = to_dm_plane_state(plane_state);
> const struct drm_color_lut *degamma_lut;
> @@ -906,6 +909,9 @@ __set_dm_plane_degamma(struct drm_plane_state *plane_state,
> bool has_degamma_lut;
> int ret;
>
> + if (dc_plane_state->ctx && dc_plane_state->ctx->dc)
> + color_caps = &dc_plane_state->ctx->dc->caps.color;
> +
We already do this in amdgpu_dm_update_plane_color_mgmt and pass color_caps
into this function. We shouldn't need to do this here again.
Harry
> degamma_lut = __extract_blob_lut(dm_plane_state->degamma_lut,
> °amma_size);
>
> @@ -928,7 +934,7 @@ __set_dm_plane_degamma(struct drm_plane_state *plane_state,
> dc_plane_state->in_transfer_func->type =
> TF_TYPE_DISTRIBUTED_POINTS;
>
> - ret = __set_input_tf(dc_plane_state->in_transfer_func,
> + ret = __set_input_tf(color_caps, dc_plane_state->in_transfer_func,
> degamma_lut, degamma_size);
> if (ret)
> return ret;
> @@ -945,7 +951,8 @@ __set_dm_plane_degamma(struct drm_plane_state *plane_state,
>
> static int
> amdgpu_dm_plane_set_color_properties(struct drm_plane_state *plane_state,
> - struct dc_plane_state *dc_plane_state)
> + struct dc_plane_state *dc_plane_state,
> + struct dc_color_caps *color_caps)
> {
> struct dm_plane_state *dm_plane_state = to_dm_plane_state(plane_state);
> enum drm_transfer_function shaper_tf = DRM_TRANSFER_FUNCTION_DEFAULT;
> @@ -1013,9 +1020,13 @@ int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
> struct drm_plane_state *plane_state,
> struct dc_plane_state *dc_plane_state)
> {
> + struct dc_color_caps *color_caps = NULL;
> bool has_crtc_cm_degamma;
> int ret;
>
> + if (dc_plane_state->ctx && dc_plane_state->ctx->dc)
> + color_caps = &dc_plane_state->ctx->dc->caps.color;
> +
> /* Initially, we can just bypass the DGM block. */
> dc_plane_state->in_transfer_func->type = TF_TYPE_BYPASS;
> dc_plane_state->in_transfer_func->tf = TRANSFER_FUNCTION_LINEAR;
> @@ -1023,7 +1034,7 @@ int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
> /* After, we start to update values according to color props */
> has_crtc_cm_degamma = (crtc->cm_has_degamma || crtc->cm_is_degamma_srgb);
>
> - ret = __set_dm_plane_degamma(plane_state, dc_plane_state);
> + ret = __set_dm_plane_degamma(plane_state, dc_plane_state, color_caps);
> if (ret == -ENOMEM)
> return ret;
>
> @@ -1049,11 +1060,11 @@ int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
> * linearize (implicit degamma) from sRGB/BT709 according to
> * the input space.
> */
> - ret = map_crtc_degamma_to_dc_plane(crtc, dc_plane_state);
> + ret = map_crtc_degamma_to_dc_plane(crtc, dc_plane_state, color_caps);
> if (ret)
> return ret;
> }
>
> return amdgpu_dm_plane_set_color_properties(plane_state,
> - dc_plane_state);
> + dc_plane_state, color_caps);
> }
More information about the dri-devel
mailing list