From: Melissa Wen <mwen@igalia.com> To: amd-gfx@lists.freedesktop.org, Harry Wentland <harry.wentland@amd.com>, 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>, 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: [PATCH 30/36] drm/amd/display: add dc_fixpt_from_s3132 helper Date: Tue, 23 May 2023 21:15:14 -0100 [thread overview] Message-ID: <20230523221520.3115570-31-mwen@igalia.com> (raw) In-Reply-To: <20230523221520.3115570-1-mwen@igalia.com> From: Joshua Ashton <joshua@froggi.es> Detach value translation from CTM to reuse it for programming HDR multiplier property. Signed-off-by: Joshua Ashton <joshua@froggi.es> Signed-off-by: Melissa Wen <mwen@igalia.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 8 +------- drivers/gpu/drm/amd/display/include/fixed31_32.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 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 8452519cabe8..629ba10fbee9 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 @@ -183,7 +183,6 @@ static void __drm_lut_to_dc_gamma(const struct drm_color_lut *lut, static void __drm_ctm_to_dc_matrix(const struct drm_color_ctm *ctm, struct fixed31_32 *matrix) { - int64_t val; int i; /* @@ -202,12 +201,7 @@ static void __drm_ctm_to_dc_matrix(const struct drm_color_ctm *ctm, } /* gamut_remap_matrix[i] = ctm[i - floor(i/4)] */ - val = ctm->matrix[i - (i / 4)]; - /* If negative, convert to 2's complement. */ - if (val & (1ULL << 63)) - val = -(val & ~(1ULL << 63)); - - matrix[i].value = val; + matrix[i] = dc_fixpt_from_s3132(ctm->matrix[i - (i / 4)]); } } diff --git a/drivers/gpu/drm/amd/display/include/fixed31_32.h b/drivers/gpu/drm/amd/display/include/fixed31_32.h index ece97ae0e826..f4cc7f97329f 100644 --- a/drivers/gpu/drm/amd/display/include/fixed31_32.h +++ b/drivers/gpu/drm/amd/display/include/fixed31_32.h @@ -69,6 +69,18 @@ static const struct fixed31_32 dc_fixpt_epsilon = { 1LL }; static const struct fixed31_32 dc_fixpt_half = { 0x80000000LL }; static const struct fixed31_32 dc_fixpt_one = { 0x100000000LL }; +static inline struct fixed31_32 dc_fixpt_from_s3132(__u64 x) +{ + struct fixed31_32 val; + + /* If negative, convert to 2's complement. */ + if (x & (1ULL << 63)) + x = -(x & ~(1ULL << 63)); + + val.value = x; + return val; +} + /* * @brief * Initialization routines -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Melissa Wen <mwen@igalia.com> To: amd-gfx@lists.freedesktop.org, Harry Wentland <harry.wentland@amd.com>, 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: [PATCH 30/36] drm/amd/display: add dc_fixpt_from_s3132 helper Date: Tue, 23 May 2023 21:15:14 -0100 [thread overview] Message-ID: <20230523221520.3115570-31-mwen@igalia.com> (raw) In-Reply-To: <20230523221520.3115570-1-mwen@igalia.com> From: Joshua Ashton <joshua@froggi.es> Detach value translation from CTM to reuse it for programming HDR multiplier property. Signed-off-by: Joshua Ashton <joshua@froggi.es> Signed-off-by: Melissa Wen <mwen@igalia.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 8 +------- drivers/gpu/drm/amd/display/include/fixed31_32.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 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 8452519cabe8..629ba10fbee9 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 @@ -183,7 +183,6 @@ static void __drm_lut_to_dc_gamma(const struct drm_color_lut *lut, static void __drm_ctm_to_dc_matrix(const struct drm_color_ctm *ctm, struct fixed31_32 *matrix) { - int64_t val; int i; /* @@ -202,12 +201,7 @@ static void __drm_ctm_to_dc_matrix(const struct drm_color_ctm *ctm, } /* gamut_remap_matrix[i] = ctm[i - floor(i/4)] */ - val = ctm->matrix[i - (i / 4)]; - /* If negative, convert to 2's complement. */ - if (val & (1ULL << 63)) - val = -(val & ~(1ULL << 63)); - - matrix[i].value = val; + matrix[i] = dc_fixpt_from_s3132(ctm->matrix[i - (i / 4)]); } } diff --git a/drivers/gpu/drm/amd/display/include/fixed31_32.h b/drivers/gpu/drm/amd/display/include/fixed31_32.h index ece97ae0e826..f4cc7f97329f 100644 --- a/drivers/gpu/drm/amd/display/include/fixed31_32.h +++ b/drivers/gpu/drm/amd/display/include/fixed31_32.h @@ -69,6 +69,18 @@ static const struct fixed31_32 dc_fixpt_epsilon = { 1LL }; static const struct fixed31_32 dc_fixpt_half = { 0x80000000LL }; static const struct fixed31_32 dc_fixpt_one = { 0x100000000LL }; +static inline struct fixed31_32 dc_fixpt_from_s3132(__u64 x) +{ + struct fixed31_32 val; + + /* If negative, convert to 2's complement. */ + if (x & (1ULL << 63)) + x = -(x & ~(1ULL << 63)); + + val.value = x; + return val; +} + /* * @brief * Initialization routines -- 2.39.2
next prev parent reply other threads:[~2023-05-23 22:16 UTC|newest] Thread overview: 124+ 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 ` 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:14 ` Melissa Wen 2023-05-23 22:21 ` Simon Ser 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-23 22:14 ` Melissa Wen 2023-05-25 14:48 ` Liviu Dudau 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 ` 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 ` 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 ` 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-23 22:14 ` Melissa Wen 2023-05-24 8:24 ` Pekka Paalanen 2023-05-24 8:24 ` Pekka Paalanen 2023-05-25 15:32 ` Harry Wentland 2023-05-25 15:32 ` Harry Wentland 2023-05-25 19:43 ` kernel test robot 2023-05-25 19:43 ` kernel test robot 2023-06-01 19:17 ` Harry Wentland 2023-06-01 19:17 ` Harry Wentland 2023-06-06 16:18 ` Joshua Ashton 2023-06-06 16:18 ` Joshua Ashton 2023-06-06 16:26 ` Sebastian Wick 2023-06-06 16:26 ` Sebastian Wick 2023-06-06 16:57 ` Melissa Wen 2023-06-06 16:57 ` Melissa Wen 2023-06-06 20:03 ` Harry Wentland 2023-06-06 20:03 ` Harry Wentland 2023-06-06 17:14 ` Melissa Wen 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-05-23 22:14 ` Melissa Wen 2023-06-01 19:24 ` Harry Wentland 2023-06-01 19:24 ` Harry Wentland 2023-06-06 17:15 ` Melissa Wen 2023-06-06 17:15 ` Melissa Wen 2023-06-10 5:34 ` Joshua Ashton 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-23 22:14 ` Melissa Wen 2023-05-26 2:57 ` kernel test robot 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-05-23 22:14 ` Melissa Wen 2023-06-01 19:33 ` Harry Wentland 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 ` Melissa Wen 2023-05-23 22:14 ` [PATCH 11/36] drm/amd/display: add plane shaper " Melissa Wen 2023-05-23 22:14 ` 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 ` 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 ` 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 ` Melissa Wen 2023-05-23 22:14 ` [PATCH 15/36] drm/amd/display: encapsulate atomic regamma operation Melissa Wen 2023-05-23 22:14 ` 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 ` 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 ` 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 ` 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 ` 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 ` Melissa Wen 2023-05-23 22:15 ` [PATCH 21/36] drm/amd/display: add CRTC 3D LUT support Melissa Wen 2023-05-23 22:15 ` Melissa Wen 2023-05-25 1:13 ` kernel test robot 2023-05-25 1:13 ` kernel test robot 2023-06-01 20:19 ` Harry Wentland 2023-06-01 20:19 ` Harry Wentland 2023-06-06 17:03 ` Melissa Wen 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` Melissa Wen 2023-05-23 22:15 ` Melissa Wen [this message] 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 ` 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 ` 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 ` 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 ` 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 ` 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-05-23 22:15 ` Melissa Wen 2023-06-02 15:10 ` Harry Wentland 2023-06-02 15:10 ` Harry Wentland 2023-05-29 22:55 ` [PATCH 00/36] drm/amd/display: add AMD driver-specific properties for color mgmt Dmitry Baryshkov 2023-05-29 22:55 ` Dmitry Baryshkov 2023-05-30 7:22 ` Pekka Paalanen 2023-05-30 7:22 ` Pekka Paalanen 2023-06-02 15:18 ` Harry Wentland 2023-06-02 15:18 ` Harry Wentland 2023-06-06 17:22 ` Melissa Wen 2023-06-06 17:22 ` Melissa Wen 2023-06-06 17:29 ` 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=20230523221520.3115570-31-mwen@igalia.com \ --to=mwen@igalia.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=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=harry.wentland@amd.com \ --cc=joshua@froggi.es \ --cc=kernel-dev@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.