From: Harry Wentland <harry.wentland@amd.com>
To: Melissa Wen <mwen@igalia.com>,
amd-gfx@lists.freedesktop.org,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
sunpeng.li@amd.com, Alex Deucher <alexander.deucher@amd.com>,
dri-devel@lists.freedesktop.org, christian.koenig@amd.com,
Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch
Cc: Sebastian Wick <sebastian.wick@redhat.com>,
Pekka Paalanen <pekka.paalanen@collabora.com>,
Shashank Sharma <Shashank.Sharma@amd.com>,
Alex Hung <alex.hung@amd.com>, Simon Ser <contact@emersion.fr>,
Xaver Hugl <xaver.hugl@gmail.com>,
kernel-dev@igalia.com,
Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
Joshua Ashton <joshua@froggi.es>,
sungjoon.kim@amd.com
Subject: Re: [PATCH 36/36] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG
Date: Fri, 2 Jun 2023 11:10:12 -0400 [thread overview]
Message-ID: <f2ac71b5-9b2a-4318-1b3a-863285ae05fd@amd.com> (raw)
In-Reply-To: <20230523221520.3115570-37-mwen@igalia.com>
On 5/23/23 18:15, Melissa Wen wrote:
> From: Joshua Ashton <joshua@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@froggi.es>
> Signed-off-by: Melissa Wen <mwen@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);
> }
next prev parent reply other threads:[~2023-06-02 15:10 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 22:14 [PATCH 00/36] drm/amd/display: add AMD driver-specific properties for color mgmt Melissa Wen
2023-05-23 22:14 ` [PATCH 01/36] drm/drm_mode_object: increase max objects to accommodate new color props Melissa Wen
2023-05-23 22:21 ` Simon Ser
2023-05-23 22:14 ` [PATCH 02/36] drm/drm_property: make replace_property_blob_from_id a DRM helper Melissa Wen
2023-05-25 14:48 ` Liviu Dudau
2023-05-23 22:14 ` [PATCH 03/36] drm/drm_plane: track color mgmt changes per plane Melissa Wen
2023-05-23 22:14 ` [PATCH 04/36] drm/amd/display: fix segment distribution for linear LUTs Melissa Wen
2023-05-23 22:14 ` [PATCH 05/36] drm/amd/display: fix the delta clamping for shaper LUT Melissa Wen
2023-05-23 22:14 ` [PATCH 06/36] drm/amd/display: add CRTC driver-specific property for gamma TF Melissa Wen
2023-05-24 8:24 ` Pekka Paalanen
2023-05-25 15:32 ` Harry Wentland
2023-05-25 19:43 ` kernel test robot
2023-06-01 19:17 ` Harry Wentland
2023-06-06 16:18 ` Joshua Ashton
2023-06-06 16:26 ` Sebastian Wick
2023-06-06 16:57 ` Melissa Wen
2023-06-06 20:03 ` Harry Wentland
2023-06-06 17:14 ` Melissa Wen
2023-05-23 22:14 ` [PATCH 07/36] drm/amd/display: add plane driver-specific properties for degamma LUT Melissa Wen
2023-06-01 19:24 ` Harry Wentland
2023-06-06 17:15 ` Melissa Wen
2023-06-10 5:34 ` Joshua Ashton
2023-05-23 22:14 ` [PATCH 08/36] drm/amd/display: add plane degamma TF driver-specific property Melissa Wen
2023-05-26 2:57 ` kernel test robot
2023-05-23 22:14 ` [PATCH 09/36] drm/amd/display: add plane HDR multiplier " Melissa Wen
2023-06-01 19:33 ` Harry Wentland
2023-05-23 22:14 ` [PATCH 10/36] drm/amd/display: add plane 3D LUT driver-specific properties Melissa Wen
2023-05-23 22:14 ` [PATCH 11/36] drm/amd/display: add plane shaper " Melissa Wen
2023-05-23 22:14 ` [PATCH 12/36] drm/amd/display: add plane shaper TF driver-private property Melissa Wen
2023-05-23 22:14 ` [PATCH 13/36] drm/amd/display: add plane blend LUT and TF driver-specific properties Melissa Wen
2023-05-23 22:14 ` [PATCH 14/36] drm/amd/display: add comments to describe DM crtc color mgmt behavior Melissa Wen
2023-05-23 22:14 ` [PATCH 15/36] drm/amd/display: encapsulate atomic regamma operation Melissa Wen
2023-05-23 22:15 ` [PATCH 16/36] drm/amd/display: update lut3d and shaper lut to stream Melissa Wen
2023-05-23 22:15 ` [PATCH 17/36] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Melissa Wen
2023-05-23 22:15 ` [PATCH 18/36] drm/amd/display: allow BYPASS 3D LUT but keep shaper LUT settings Melissa Wen
2023-05-23 22:15 ` [PATCH 19/36] drm/amd/display: handle MPC 3D LUT resources for a given context Melissa Wen
2023-05-23 22:15 ` [PATCH 20/36] drm/amd/display: dynamically acquire 3DLUT resources for color changes Melissa Wen
2023-05-23 22:15 ` [PATCH 21/36] drm/amd/display: add CRTC 3D LUT support Melissa Wen
2023-05-25 1:13 ` kernel test robot
2023-06-01 20:19 ` Harry Wentland
2023-06-06 17:03 ` Melissa Wen
2023-05-23 22:15 ` [PATCH 22/36] drm/amd/display: add CRTC shaper " Melissa Wen
2023-05-23 22:15 ` [PATCH 23/36] drm/amd/display: add CRTC regamma TF support Melissa Wen
2023-05-23 22:15 ` [PATCH 24/36] drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func Melissa Wen
2023-05-23 22:15 ` [PATCH 25/36] drm/amd/display: add CRTC shaper TF support Melissa Wen
2023-05-23 22:15 ` [PATCH 26/36] drm/amd/display: mark plane as needing reset if plane color mgmt changes Melissa Wen
2023-05-23 22:15 ` [PATCH 27/36] drm/amd/display: decouple steps for mapping CRTC degamma to DC plane Melissa Wen
2023-05-23 22:15 ` [PATCH 28/36] drm/amd/display: add support for plane degamma TF and LUT properties Melissa Wen
2023-05-23 22:15 ` [PATCH 29/36] drm/amd/display: reject atomic commit if setting both plane and CRTC degamma Melissa Wen
2023-05-23 22:15 ` [PATCH 30/36] drm/amd/display: add dc_fixpt_from_s3132 helper Melissa Wen
2023-05-23 22:15 ` [PATCH 31/36] drm/adm/display: add HDR multiplier support Melissa Wen
2023-05-23 22:15 ` [PATCH 32/36] drm/amd/display: program DPP shaper and 3D LUT if updated Melissa Wen
2023-05-23 22:15 ` [PATCH 33/36] drm/amd/display: add plane shaper/3D LUT and shaper TF support Melissa Wen
2023-05-23 22:15 ` [PATCH 34/36] drm/amd/display: handle empty LUTs in __set_input_tf Melissa Wen
2023-05-23 22:15 ` [PATCH 35/36] drm/amd/display: add DRM plane blend LUT and TF support Melissa Wen
2023-05-23 22:15 ` [PATCH 36/36] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG Melissa Wen
2023-06-02 15:10 ` Harry Wentland [this message]
2023-05-29 22:55 ` [PATCH 00/36] drm/amd/display: add AMD driver-specific properties for color mgmt Dmitry Baryshkov
2023-05-30 7:22 ` Pekka Paalanen
2023-06-02 15:18 ` Harry Wentland
2023-06-06 17:22 ` Melissa Wen
2023-06-06 17:29 ` Melissa Wen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2ac71b5-9b2a-4318-1b3a-863285ae05fd@amd.com \
--to=harry.wentland@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Shashank.Sharma@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=joshua@froggi.es \
--cc=kernel-dev@igalia.com \
--cc=mwen@igalia.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=pekka.paalanen@collabora.com \
--cc=sebastian.wick@redhat.com \
--cc=sungjoon.kim@amd.com \
--cc=sunpeng.li@amd.com \
--cc=xaver.hugl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox