drm/amd/display: Move custom_float from DML folder
authorRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tue, 3 Oct 2023 14:05:56 +0000 (08:05 -0600)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 9 Oct 2023 20:48:31 +0000 (16:48 -0400)
The custom_float file does not have any FPU operation, so it should be
inside DML. This commit moves the file to the basic folder.

Reviewed-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/basics/Makefile
drivers/gpu/drm/amd/display/dc/basics/custom_float.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dml/Makefile
drivers/gpu/drm/amd/display/dc/dml/calcs/custom_float.c [deleted file]

index ee611b03dc48fb588c04fd49e2f75d23af7abaf8..65d713aff40711f8ef256cc418383b3e02b2b0bd 100644 (file)
@@ -29,7 +29,8 @@ BASICS := \
        fixpt31_32.o \
        vector.o \
        dc_common.o \
-       dce_calcs.o
+       dce_calcs.o \
+       custom_float.o
 
 AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS))
 
diff --git a/drivers/gpu/drm/amd/display/dc/basics/custom_float.c b/drivers/gpu/drm/amd/display/dc/basics/custom_float.c
new file mode 100644 (file)
index 0000000..ae05ded
--- /dev/null
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2023 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+#include "dm_services.h"
+#include "custom_float.h"
+
+static bool build_custom_float(struct fixed31_32 value,
+                              const struct custom_float_format *format,
+                              bool *negative,
+                              uint32_t *mantissa,
+                              uint32_t *exponenta)
+{
+       uint32_t exp_offset = (1 << (format->exponenta_bits - 1)) - 1;
+
+       const struct fixed31_32 mantissa_constant_plus_max_fraction =
+               dc_fixpt_from_fraction((1LL << (format->mantissa_bits + 1)) - 1,
+                                      1LL << format->mantissa_bits);
+
+       struct fixed31_32 mantiss;
+
+       if (dc_fixpt_eq(value, dc_fixpt_zero)) {
+               *negative = false;
+               *mantissa = 0;
+               *exponenta = 0;
+               return true;
+       }
+
+       if (dc_fixpt_lt(value, dc_fixpt_zero)) {
+               *negative = format->sign;
+               value = dc_fixpt_neg(value);
+       } else {
+               *negative = false;
+       }
+
+       if (dc_fixpt_lt(value, dc_fixpt_one)) {
+               uint32_t i = 1;
+
+               do {
+                       value = dc_fixpt_shl(value, 1);
+                       ++i;
+               } while (dc_fixpt_lt(value, dc_fixpt_one));
+
+               --i;
+
+               if (exp_offset <= i) {
+                       *mantissa = 0;
+                       *exponenta = 0;
+                       return true;
+               }
+
+               *exponenta = exp_offset - i;
+       } else if (dc_fixpt_le(mantissa_constant_plus_max_fraction, value)) {
+               uint32_t i = 1;
+
+               do {
+                       value = dc_fixpt_shr(value, 1);
+                       ++i;
+               } while (dc_fixpt_lt(mantissa_constant_plus_max_fraction, value));
+
+               *exponenta = exp_offset + i - 1;
+       } else {
+               *exponenta = exp_offset;
+       }
+
+       mantiss = dc_fixpt_sub(value, dc_fixpt_one);
+
+       if (dc_fixpt_lt(mantiss, dc_fixpt_zero) ||
+           dc_fixpt_lt(dc_fixpt_one, mantiss))
+               mantiss = dc_fixpt_zero;
+       else
+               mantiss = dc_fixpt_shl(mantiss, format->mantissa_bits);
+
+       *mantissa = dc_fixpt_floor(mantiss);
+
+       return true;
+}
+
+static bool setup_custom_float(const struct custom_float_format *format,
+                              bool negative,
+                              uint32_t mantissa,
+                              uint32_t exponenta,
+                              uint32_t *result)
+{
+       uint32_t i = 0;
+       uint32_t j = 0;
+       uint32_t value = 0;
+
+       /* verification code:
+        * once calculation is ok we can remove it
+        */
+
+       const uint32_t mantissa_mask =
+               (1 << (format->mantissa_bits + 1)) - 1;
+
+       const uint32_t exponenta_mask =
+               (1 << (format->exponenta_bits + 1)) - 1;
+
+       if (mantissa & ~mantissa_mask) {
+               BREAK_TO_DEBUGGER();
+               mantissa = mantissa_mask;
+       }
+
+       if (exponenta & ~exponenta_mask) {
+               BREAK_TO_DEBUGGER();
+               exponenta = exponenta_mask;
+       }
+
+       /* end of verification code */
+
+       while (i < format->mantissa_bits) {
+               uint32_t mask = 1 << i;
+
+               if (mantissa & mask)
+                       value |= mask;
+
+               ++i;
+       }
+
+       while (j < format->exponenta_bits) {
+               uint32_t mask = 1 << j;
+
+               if (exponenta & mask)
+                       value |= mask << i;
+
+               ++j;
+       }
+
+       if (negative && format->sign)
+               value |= 1 << (i + j);
+
+       *result = value;
+
+       return true;
+}
+
+bool convert_to_custom_float_format(struct fixed31_32 value,
+                                   const struct custom_float_format *format,
+                                   uint32_t *result)
+{
+       uint32_t mantissa;
+       uint32_t exponenta;
+       bool negative;
+
+       return build_custom_float(value, format, &negative, &mantissa, &exponenta) &&
+                                 setup_custom_float(format,
+                                                    negative,
+                                                    mantissa,
+                                                    exponenta,
+                                                    result);
+}
+
index 8621dfe9a68c7a7050a4a72d098db3c1aa79a687..2fe8588a070a69a2a0c5c9b4b635f4fdbecd61c6 100644 (file)
@@ -134,7 +134,7 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calcs.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_auto.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/calcs/dcn_calc_math.o := $(dml_rcflags)
 
-DML = calcs/custom_float.o calcs/bw_fixed.o
+DML = calcs/bw_fixed.o
 
 ifdef CONFIG_DRM_AMD_DC_FP
 DML += display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o
diff --git a/drivers/gpu/drm/amd/display/dc/dml/calcs/custom_float.c b/drivers/gpu/drm/amd/display/dc/dml/calcs/custom_float.c
deleted file mode 100644 (file)
index 31d167b..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2017 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-#include "dm_services.h"
-#include "custom_float.h"
-
-
-static bool build_custom_float(
-       struct fixed31_32 value,
-       const struct custom_float_format *format,
-       bool *negative,
-       uint32_t *mantissa,
-       uint32_t *exponenta)
-{
-       uint32_t exp_offset = (1 << (format->exponenta_bits - 1)) - 1;
-
-       const struct fixed31_32 mantissa_constant_plus_max_fraction =
-               dc_fixpt_from_fraction(
-                       (1LL << (format->mantissa_bits + 1)) - 1,
-                       1LL << format->mantissa_bits);
-
-       struct fixed31_32 mantiss;
-
-       if (dc_fixpt_eq(
-               value,
-               dc_fixpt_zero)) {
-               *negative = false;
-               *mantissa = 0;
-               *exponenta = 0;
-               return true;
-       }
-
-       if (dc_fixpt_lt(
-               value,
-               dc_fixpt_zero)) {
-               *negative = format->sign;
-               value = dc_fixpt_neg(value);
-       } else {
-               *negative = false;
-       }
-
-       if (dc_fixpt_lt(
-               value,
-               dc_fixpt_one)) {
-               uint32_t i = 1;
-
-               do {
-                       value = dc_fixpt_shl(value, 1);
-                       ++i;
-               } while (dc_fixpt_lt(
-                       value,
-                       dc_fixpt_one));
-
-               --i;
-
-               if (exp_offset <= i) {
-                       *mantissa = 0;
-                       *exponenta = 0;
-                       return true;
-               }
-
-               *exponenta = exp_offset - i;
-       } else if (dc_fixpt_le(
-               mantissa_constant_plus_max_fraction,
-               value)) {
-               uint32_t i = 1;
-
-               do {
-                       value = dc_fixpt_shr(value, 1);
-                       ++i;
-               } while (dc_fixpt_lt(
-                       mantissa_constant_plus_max_fraction,
-                       value));
-
-               *exponenta = exp_offset + i - 1;
-       } else {
-               *exponenta = exp_offset;
-       }
-
-       mantiss = dc_fixpt_sub(
-               value,
-               dc_fixpt_one);
-
-       if (dc_fixpt_lt(
-                       mantiss,
-                       dc_fixpt_zero) ||
-               dc_fixpt_lt(
-                       dc_fixpt_one,
-                       mantiss))
-               mantiss = dc_fixpt_zero;
-       else
-               mantiss = dc_fixpt_shl(
-                       mantiss,
-                       format->mantissa_bits);
-
-       *mantissa = dc_fixpt_floor(mantiss);
-
-       return true;
-}
-
-static bool setup_custom_float(
-       const struct custom_float_format *format,
-       bool negative,
-       uint32_t mantissa,
-       uint32_t exponenta,
-       uint32_t *result)
-{
-       uint32_t i = 0;
-       uint32_t j = 0;
-
-       uint32_t value = 0;
-
-       /* verification code:
-        * once calculation is ok we can remove it
-        */
-
-       const uint32_t mantissa_mask =
-               (1 << (format->mantissa_bits + 1)) - 1;
-
-       const uint32_t exponenta_mask =
-               (1 << (format->exponenta_bits + 1)) - 1;
-
-       if (mantissa & ~mantissa_mask) {
-               BREAK_TO_DEBUGGER();
-               mantissa = mantissa_mask;
-       }
-
-       if (exponenta & ~exponenta_mask) {
-               BREAK_TO_DEBUGGER();
-               exponenta = exponenta_mask;
-       }
-
-       /* end of verification code */
-
-       while (i < format->mantissa_bits) {
-               uint32_t mask = 1 << i;
-
-               if (mantissa & mask)
-                       value |= mask;
-
-               ++i;
-       }
-
-       while (j < format->exponenta_bits) {
-               uint32_t mask = 1 << j;
-
-               if (exponenta & mask)
-                       value |= mask << i;
-
-               ++j;
-       }
-
-       if (negative && format->sign)
-               value |= 1 << (i + j);
-
-       *result = value;
-
-       return true;
-}
-
-bool convert_to_custom_float_format(
-       struct fixed31_32 value,
-       const struct custom_float_format *format,
-       uint32_t *result)
-{
-       uint32_t mantissa;
-       uint32_t exponenta;
-       bool negative;
-
-       return build_custom_float(
-               value, format, &negative, &mantissa, &exponenta) &&
-       setup_custom_float(
-               format, negative, mantissa, exponenta, result);
-}
-
-