drm/amd/display: Move unity TF type to predefined types

Also handle fixpoint y values for CM curves
Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

drivers/gpu/drm/amd/display/dc/dc.h

@@ -343,7 +343,6 @@ enum dc_transfer_func_type {
 	TF_TYPE_PREDEFINED,
 	TF_TYPE_DISTRIBUTED_POINTS,
 	TF_TYPE_BYPASS,
-	TF_TYPE_UNITY
 };
 
 struct dc_transfer_func_distributed_points {
@@ -362,6 +361,7 @@ enum dc_transfer_func_predefined {
 	TRANSFER_FUNCTION_BT709,
 	TRANSFER_FUNCTION_PQ,
 	TRANSFER_FUNCTION_LINEAR,
+	TRANSFER_FUNCTION_UNITY,
 };
 
 struct dc_transfer_func {

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c

@@ -168,7 +168,9 @@ bool cm_helper_convert_to_custom_float(
 		return false;
 	}
 
-	if (!convert_to_custom_float_format(arr_points[1].y, &fmt,
+	if (fixpoint == true)
+		arr_points[1].custom_float_y = dal_fixed31_32_u0d14(arr_points[1].y);
+	else if (!convert_to_custom_float_format(arr_points[1].y, &fmt,
 		&arr_points[1].custom_float_y)) {
 		BREAK_TO_DEBUGGER();
 		return false;

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h

@@ -731,7 +731,7 @@
 	type CM_BLNDGAM_LUT_WRITE_EN_MASK; \
 	type CM_BLNDGAM_LUT_WRITE_SEL; \
 	type CM_BLNDGAM_LUT_INDEX; \
-	type CM_BLNDGAM_LUT_DATA; \
+	type BLNDGAM_MEM_PWR_FORCE; \
 	type CM_3DLUT_MODE; \
 	type CM_3DLUT_SIZE; \
 	type CM_3DLUT_INDEX; \
@@ -1147,7 +1147,6 @@ struct dcn_dpp_mask {
 	uint32_t CM_BLNDGAM_RAMA_REGION_30_31; \
 	uint32_t CM_BLNDGAM_RAMA_REGION_32_33; \
 	uint32_t CM_BLNDGAM_LUT_INDEX; \
-	uint32_t CM_BLNDGAM_LUT_DATA; \
 	uint32_t CM_3DLUT_MODE; \
 	uint32_t CM_3DLUT_INDEX; \
 	uint32_t CM_3DLUT_DATA; \