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 v5 21/32] drm/amd/display: add dc_fixpt_from_s3132 helper
Date: Thu, 16 Nov 2023 18:58:01 -0100 [thread overview]
Message-ID: <20231116195812.906115-22-mwen@igalia.com> (raw)
In-Reply-To: <20231116195812.906115-1-mwen@igalia.com>
From: Joshua Ashton <joshua@froggi.es>
Detach value translation from CTM to reuse it for programming HDR
multiplier property.
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
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 8fc715fa426c..c160dbef5224 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
@@ -405,7 +405,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;
/*
@@ -424,12 +423,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 d4cf7ead1d87..84da1dd34efd 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.40.1
next prev parent reply other threads:[~2023-11-16 19:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 19:57 [PATCH v5 00/32] drm/amd/display: add AMD driver-specific properties for color mgmt Melissa Wen
2023-11-16 19:57 ` [PATCH v5 01/32] drm/drm_mode_object: increase max objects to accommodate new color props Melissa Wen
2023-11-16 22:15 ` Abhinav Kumar
2023-11-16 19:57 ` [PATCH v5 02/32] drm/drm_property: make replace_property_blob_from_id a DRM helper Melissa Wen
2023-11-16 19:57 ` [PATCH v5 03/32] drm/drm_plane: track color mgmt changes per plane Melissa Wen
2023-11-16 19:57 ` [PATCH v5 04/32] drm/amd/display: add driver-specific property for plane degamma LUT Melissa Wen
2023-11-16 19:57 ` [PATCH v5 05/32] drm/amd/display: add plane degamma TF driver-specific property Melissa Wen
2023-11-16 19:57 ` [PATCH v5 06/32] drm/amd/display: explicitly define EOTF and inverse EOTF Melissa Wen
2023-11-16 19:57 ` [PATCH v5 07/32] drm/amd/display: document AMDGPU pre-defined transfer functions Melissa Wen
2023-11-16 19:57 ` [PATCH v5 08/32] drm/amd/display: add plane HDR multiplier driver-specific property Melissa Wen
2023-11-16 19:57 ` [PATCH v5 09/32] drm/amd/display: add plane 3D LUT driver-specific properties Melissa Wen
2023-11-17 19:14 ` Harry Wentland
2023-11-16 19:57 ` [PATCH v5 10/32] drm/amd/display: add plane shaper LUT and TF " Melissa Wen
2023-11-16 19:57 ` [PATCH v5 11/32] drm/amd/display: add plane blend " Melissa Wen
2023-11-16 19:57 ` [PATCH v5 12/32] drm/amd/display: add CRTC gamma TF driver-specific property Melissa Wen
2023-11-16 19:57 ` [PATCH v5 13/32] drm/amd/display: add comments to describe DM crtc color mgmt behavior Melissa Wen
2023-11-16 19:57 ` [PATCH v5 14/32] drm/amd/display: encapsulate atomic regamma operation Melissa Wen
2023-11-16 19:57 ` [PATCH v5 15/32] drm/amd/display: add CRTC gamma TF support Melissa Wen
2023-11-16 19:57 ` [PATCH v5 16/32] drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func Melissa Wen
2023-11-16 19:57 ` [PATCH v5 17/32] drm/amd/display: mark plane as needing reset if color props change Melissa Wen
2023-11-16 19:57 ` [PATCH v5 18/32] drm/amd/display: decouple steps for mapping CRTC degamma to DC plane Melissa Wen
2023-11-16 19:57 ` [PATCH v5 19/32] drm/amd/display: add plane degamma TF and LUT support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 20/32] drm/amd/display: reject atomic commit if setting both plane and CRTC degamma Melissa Wen
2023-11-16 19:58 ` Melissa Wen [this message]
2023-11-16 19:58 ` [PATCH v5 22/32] drm/amd/display: add HDR multiplier support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 23/32] drm/amd/display: add plane shaper LUT support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 24/32] drm/amd/display: add plane shaper TF support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 25/32] drm/amd/display: add plane 3D LUT support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 26/32] drm/amd/display: handle empty LUTs in __set_input_tf Melissa Wen
2023-11-16 19:58 ` [PATCH v5 27/32] drm/amd/display: add plane blend LUT and TF support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 28/32] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG Melissa Wen
2023-11-16 19:58 ` [PATCH v5 29/32] drm/amd/display: copy 3D LUT settings from crtc state to stream_update Melissa Wen
2023-11-16 19:58 ` [PATCH v5 30/32] drm/amd/display: add plane CTM driver-specific property Melissa Wen
2023-11-16 19:58 ` [PATCH v5 31/32] drm/amd/display: add plane CTM support Melissa Wen
2023-11-16 19:58 ` [PATCH v5 32/32] drm/amd/display: Add 3x4 CTM support for plane CTM Melissa Wen
2023-11-28 22:10 ` [PATCH v5 00/32] drm/amd/display: add AMD driver-specific properties for color mgmt Harry Wentland
2023-11-30 11:34 ` Daniel Vetter
2023-12-01 15:20 ` Harry Wentland
2023-12-04 8:46 ` Maxime Ripard
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=20231116195812.906115-22-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=contact@emersion.fr \
--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: 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;
as well as URLs for NNTP newsgroup(s).