diff mbox series

[v2,22/34] drm/amd/display: add dc_fixpt_from_s3132 helper

Message ID	20230810160314.48225-23-mwen@igalia.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; 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: Joshua Ashton <joshua@froggi.es>, Sebastian Wick <sebastian.wick@redhat.com>, Xaver Hugl <xaver.hugl@gmail.com>, Shashank Sharma <Shashank.Sharma@amd.com>, Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>, sungjoon.kim@amd.com, Alex Hung <alex.hung@amd.com>, Pekka Paalanen <pekka.paalanen@collabora.com>, Simon Ser <contact@emersion.fr>, kernel-dev@igalia.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 22/34] drm/amd/display: add dc_fixpt_from_s3132 helper Date: Thu, 10 Aug 2023 15:03:02 -0100 Message-Id: <20230810160314.48225-23-mwen@igalia.com> In-Reply-To: <20230810160314.48225-1-mwen@igalia.com> References: <20230810160314.48225-1-mwen@igalia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	drm/amd/display: add AMD driver-specific properties for color mgmt \| [v2,00/34] drm/amd/display: add AMD driver-specific properties for color mgmt [v2,01/34] drm/amd/display: fix segment distribution for linear LUTs [v2,02/34] drm/drm_mode_object: increase max objects to accommodate new color props [v2,03/34] drm/drm_property: make replace_property_blob_from_id a DRM helper [v2,04/34] drm/drm_plane: track color mgmt changes per plane [v2,05/34] drm/amd/display: add driver-specific property for plane degamma LUT [v2,06/34] drm/amd/display: add plane degamma TF driver-specific property [v2,07/34] drm/amd/display: explicitly define EOTF and inverse EOTF [v2,08/34] drm/amd/display: document AMDGPU pre-defined transfer functions [v2,09/34] drm/amd/display: add plane HDR multiplier driver-specific property [v2,10/34] drm/amd/display: add plane 3D LUT driver-specific properties [v2,11/34] drm/amd/display: add plane shaper LUT and TF driver-specific properties [v2,12/34] drm/amd/display: add plane blend LUT and TF driver-specific properties [v2,13/34] drm/amd/display: add CRTC gamma TF driver-specific property [v2,14/34] drm/amd/display: add comments to describe DM crtc color mgmt behavior [v2,15/34] drm/amd/display: encapsulate atomic regamma operation [v2,16/34] drm/amd/display: add CRTC gamma TF support [v2,17/34] drm/amd/display: set sdr_ref_white_level to 80 for out_transfer_func [v2,18/34] drm/amd/display: mark plane as needing reset if color props change [v2,19/34] drm/amd/display: decouple steps for mapping CRTC degamma to DC plane [v2,20/34] drm/amd/display: add plane degamma TF and LUT support [v2,21/34] drm/amd/display: reject atomic commit if setting both plane and CRTC degamma [v2,22/34] drm/amd/display: add dc_fixpt_from_s3132 helper [v2,23/34] drm/amd/display: add HDR multiplier support [v2,24/34] drm/amd/display: add plane shaper LUT support [v2,25/34] drm/amd/display: add plane shaper TF support [v2,26/34] drm/amd/display: add plane 3D LUT support [v2,27/34] drm/amd/display: handle empty LUTs in __set_input_tf [v2,28/34] drm/amd/display: add plane blend LUT and TF support [v2,29/34] drm/amd/display: allow newer DC hardware to use degamma ROM for PQ/HLG [v2,30/34] drm/amd/display: copy 3D LUT settings from crtc state to stream_update [v2,31/34] drm/amd/display: set stream gamut remap matrix to MPC for DCN301 [v2,32/34] drm/amd/display: add plane CTM driver-specific property [v2,33/34] drm/amd/display: add plane CTM support [v2,34/34] drm/amd/display: Use 3x4 CTM for plane CTM

Commit Message

Melissa Wen Aug. 10, 2023, 4:03 p.m. UTC

  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 mbox series

Patch

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 5659f88d1f2c..db771c895720 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
@@ -383,7 +383,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;
 
 	/*
@@ -402,12 +401,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