diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1025-drm-amd-display-clean-up-functions-in-dcn10_dpp_cm.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/1025-drm-amd-display-clean-up-functions-in-dcn10_dpp_cm.patch | 1243 |
1 files changed, 1243 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1025-drm-amd-display-clean-up-functions-in-dcn10_dpp_cm.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1025-drm-amd-display-clean-up-functions-in-dcn10_dpp_cm.patch new file mode 100644 index 00000000..e4ee5316 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1025-drm-amd-display-clean-up-functions-in-dcn10_dpp_cm.patch @@ -0,0 +1,1243 @@ +From a1925e8697d505c492fb882a088086c09e9267e7 Mon Sep 17 00:00:00 2001 +From: Yue Hin Lau <Yuehin.Lau@amd.com> +Date: Mon, 28 Aug 2017 14:05:17 -0400 +Subject: [PATCH 1025/4131] drm/amd/display: clean up functions in dcn10_dpp_cm + +Change-Id: Ifeca77690784f197273f2d41e67b331ad9dfe674 +Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 420 -------------- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 628 +++++---------------- + 2 files changed, 140 insertions(+), 908 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +index 9a678dc..7179305 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +@@ -97,12 +97,6 @@ + SRI(CM_DGAM_RAMB_END_CNTL1_R, CM, id), \ + SRI(CM_DGAM_RAMB_END_CNTL2_R, CM, id), \ + SRI(CM_DGAM_RAMB_REGION_0_1, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_2_3, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_4_5, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_6_7, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_8_9, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_10_11, CM, id), \ +- SRI(CM_DGAM_RAMB_REGION_12_13, CM, id), \ + SRI(CM_DGAM_RAMB_REGION_14_15, CM, id), \ + SRI(CM_DGAM_RAMA_START_CNTL_B, CM, id), \ + SRI(CM_DGAM_RAMA_START_CNTL_G, CM, id), \ +@@ -117,12 +111,6 @@ + SRI(CM_DGAM_RAMA_END_CNTL1_R, CM, id), \ + SRI(CM_DGAM_RAMA_END_CNTL2_R, CM, id), \ + SRI(CM_DGAM_RAMA_REGION_0_1, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_2_3, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_4_5, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_6_7, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_8_9, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_10_11, CM, id), \ +- SRI(CM_DGAM_RAMA_REGION_12_13, CM, id), \ + SRI(CM_DGAM_RAMA_REGION_14_15, CM, id), \ + SRI(CM_MEM_PWR_CTRL, CM, id), \ + SRI(CM_DGAM_LUT_WRITE_EN_MASK, CM, id), \ +@@ -174,21 +162,6 @@ + SRI(CM_RGAM_RAMB_END_CNTL1_R, CM, id), \ + SRI(CM_RGAM_RAMB_END_CNTL2_R, CM, id), \ + SRI(CM_RGAM_RAMB_REGION_0_1, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_2_3, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_4_5, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_6_7, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_8_9, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_10_11, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_12_13, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_14_15, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_16_17, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_18_19, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_20_21, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_22_23, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_24_25, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_26_27, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_28_29, CM, id), \ +- SRI(CM_RGAM_RAMB_REGION_30_31, CM, id), \ + SRI(CM_RGAM_RAMB_REGION_32_33, CM, id), \ + SRI(CM_RGAM_RAMA_START_CNTL_B, CM, id), \ + SRI(CM_RGAM_RAMA_START_CNTL_G, CM, id), \ +@@ -203,21 +176,6 @@ + SRI(CM_RGAM_RAMA_END_CNTL1_R, CM, id), \ + SRI(CM_RGAM_RAMA_END_CNTL2_R, CM, id), \ + SRI(CM_RGAM_RAMA_REGION_0_1, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_2_3, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_4_5, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_6_7, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_8_9, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_10_11, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_12_13, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_14_15, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_16_17, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_18_19, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_20_21, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_22_23, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_24_25, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_26_27, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_28_29, CM, id), \ +- SRI(CM_RGAM_RAMA_REGION_30_31, CM, id), \ + SRI(CM_RGAM_RAMA_REGION_32_33, CM, id), \ + SRI(CM_RGAM_CONTROL, CM, id), \ + SRI(CM_IGAM_CONTROL, CM, id), \ +@@ -338,30 +296,6 @@ + TF_SF(CM0_CM_DGAM_RAMB_REGION_0_1, CM_DGAM_RAMB_EXP_REGION0_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMB_REGION_0_1, CM_DGAM_RAMB_EXP_REGION1_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMB_REGION_0_1, CM_DGAM_RAMB_EXP_REGION1_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_2_3, CM_DGAM_RAMB_EXP_REGION2_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_2_3, CM_DGAM_RAMB_EXP_REGION2_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_2_3, CM_DGAM_RAMB_EXP_REGION3_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_2_3, CM_DGAM_RAMB_EXP_REGION3_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_4_5, CM_DGAM_RAMB_EXP_REGION4_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_4_5, CM_DGAM_RAMB_EXP_REGION4_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_4_5, CM_DGAM_RAMB_EXP_REGION5_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_4_5, CM_DGAM_RAMB_EXP_REGION5_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_6_7, CM_DGAM_RAMB_EXP_REGION6_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_6_7, CM_DGAM_RAMB_EXP_REGION6_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_6_7, CM_DGAM_RAMB_EXP_REGION7_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_6_7, CM_DGAM_RAMB_EXP_REGION7_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_8_9, CM_DGAM_RAMB_EXP_REGION8_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_8_9, CM_DGAM_RAMB_EXP_REGION8_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_8_9, CM_DGAM_RAMB_EXP_REGION9_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_8_9, CM_DGAM_RAMB_EXP_REGION9_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_10_11, CM_DGAM_RAMB_EXP_REGION10_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_10_11, CM_DGAM_RAMB_EXP_REGION10_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_10_11, CM_DGAM_RAMB_EXP_REGION11_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_10_11, CM_DGAM_RAMB_EXP_REGION11_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_12_13, CM_DGAM_RAMB_EXP_REGION12_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_12_13, CM_DGAM_RAMB_EXP_REGION12_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_12_13, CM_DGAM_RAMB_EXP_REGION13_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMB_REGION_12_13, CM_DGAM_RAMB_EXP_REGION13_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMB_REGION_14_15, CM_DGAM_RAMB_EXP_REGION14_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMB_REGION_14_15, CM_DGAM_RAMB_EXP_REGION14_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMB_REGION_14_15, CM_DGAM_RAMB_EXP_REGION15_LUT_OFFSET, mask_sh), \ +@@ -388,30 +322,6 @@ + TF_SF(CM0_CM_DGAM_RAMA_REGION_0_1, CM_DGAM_RAMA_EXP_REGION0_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMA_REGION_0_1, CM_DGAM_RAMA_EXP_REGION1_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMA_REGION_0_1, CM_DGAM_RAMA_EXP_REGION1_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_2_3, CM_DGAM_RAMA_EXP_REGION2_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_2_3, CM_DGAM_RAMA_EXP_REGION2_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_2_3, CM_DGAM_RAMA_EXP_REGION3_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_2_3, CM_DGAM_RAMA_EXP_REGION3_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_4_5, CM_DGAM_RAMA_EXP_REGION4_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_4_5, CM_DGAM_RAMA_EXP_REGION4_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_4_5, CM_DGAM_RAMA_EXP_REGION5_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_4_5, CM_DGAM_RAMA_EXP_REGION5_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_6_7, CM_DGAM_RAMA_EXP_REGION6_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_6_7, CM_DGAM_RAMA_EXP_REGION6_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_6_7, CM_DGAM_RAMA_EXP_REGION7_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_6_7, CM_DGAM_RAMA_EXP_REGION7_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_8_9, CM_DGAM_RAMA_EXP_REGION8_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_8_9, CM_DGAM_RAMA_EXP_REGION8_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_8_9, CM_DGAM_RAMA_EXP_REGION9_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_8_9, CM_DGAM_RAMA_EXP_REGION9_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_10_11, CM_DGAM_RAMA_EXP_REGION10_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_10_11, CM_DGAM_RAMA_EXP_REGION10_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_10_11, CM_DGAM_RAMA_EXP_REGION11_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_10_11, CM_DGAM_RAMA_EXP_REGION11_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_12_13, CM_DGAM_RAMA_EXP_REGION12_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_12_13, CM_DGAM_RAMA_EXP_REGION12_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_12_13, CM_DGAM_RAMA_EXP_REGION13_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_DGAM_RAMA_REGION_12_13, CM_DGAM_RAMA_EXP_REGION13_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMA_REGION_14_15, CM_DGAM_RAMA_EXP_REGION14_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMA_REGION_14_15, CM_DGAM_RAMA_EXP_REGION14_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_DGAM_RAMA_REGION_14_15, CM_DGAM_RAMA_EXP_REGION15_LUT_OFFSET, mask_sh), \ +@@ -501,66 +411,6 @@ + TF_SF(CM0_CM_RGAM_RAMB_REGION_0_1, CM_RGAM_RAMB_EXP_REGION0_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMB_REGION_0_1, CM_RGAM_RAMB_EXP_REGION1_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMB_REGION_0_1, CM_RGAM_RAMB_EXP_REGION1_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_2_3, CM_RGAM_RAMB_EXP_REGION2_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_2_3, CM_RGAM_RAMB_EXP_REGION2_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_2_3, CM_RGAM_RAMB_EXP_REGION3_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_2_3, CM_RGAM_RAMB_EXP_REGION3_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_4_5, CM_RGAM_RAMB_EXP_REGION4_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_4_5, CM_RGAM_RAMB_EXP_REGION4_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_4_5, CM_RGAM_RAMB_EXP_REGION5_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_4_5, CM_RGAM_RAMB_EXP_REGION5_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_6_7, CM_RGAM_RAMB_EXP_REGION6_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_6_7, CM_RGAM_RAMB_EXP_REGION6_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_6_7, CM_RGAM_RAMB_EXP_REGION7_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_6_7, CM_RGAM_RAMB_EXP_REGION7_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_8_9, CM_RGAM_RAMB_EXP_REGION8_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_8_9, CM_RGAM_RAMB_EXP_REGION8_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_8_9, CM_RGAM_RAMB_EXP_REGION9_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_8_9, CM_RGAM_RAMB_EXP_REGION9_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_10_11, CM_RGAM_RAMB_EXP_REGION10_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_10_11, CM_RGAM_RAMB_EXP_REGION10_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_10_11, CM_RGAM_RAMB_EXP_REGION11_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_10_11, CM_RGAM_RAMB_EXP_REGION11_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_12_13, CM_RGAM_RAMB_EXP_REGION12_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_12_13, CM_RGAM_RAMB_EXP_REGION12_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_12_13, CM_RGAM_RAMB_EXP_REGION13_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_12_13, CM_RGAM_RAMB_EXP_REGION13_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_14_15, CM_RGAM_RAMB_EXP_REGION14_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_14_15, CM_RGAM_RAMB_EXP_REGION14_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_14_15, CM_RGAM_RAMB_EXP_REGION15_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_14_15, CM_RGAM_RAMB_EXP_REGION15_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_16_17, CM_RGAM_RAMB_EXP_REGION16_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_16_17, CM_RGAM_RAMB_EXP_REGION16_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_16_17, CM_RGAM_RAMB_EXP_REGION17_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_16_17, CM_RGAM_RAMB_EXP_REGION17_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_18_19, CM_RGAM_RAMB_EXP_REGION18_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_18_19, CM_RGAM_RAMB_EXP_REGION18_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_18_19, CM_RGAM_RAMB_EXP_REGION19_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_18_19, CM_RGAM_RAMB_EXP_REGION19_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_20_21, CM_RGAM_RAMB_EXP_REGION20_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_20_21, CM_RGAM_RAMB_EXP_REGION20_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_20_21, CM_RGAM_RAMB_EXP_REGION21_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_20_21, CM_RGAM_RAMB_EXP_REGION21_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_22_23, CM_RGAM_RAMB_EXP_REGION22_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_22_23, CM_RGAM_RAMB_EXP_REGION22_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_22_23, CM_RGAM_RAMB_EXP_REGION23_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_22_23, CM_RGAM_RAMB_EXP_REGION23_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_24_25, CM_RGAM_RAMB_EXP_REGION24_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_24_25, CM_RGAM_RAMB_EXP_REGION24_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_24_25, CM_RGAM_RAMB_EXP_REGION25_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_24_25, CM_RGAM_RAMB_EXP_REGION25_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_26_27, CM_RGAM_RAMB_EXP_REGION26_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_26_27, CM_RGAM_RAMB_EXP_REGION26_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_26_27, CM_RGAM_RAMB_EXP_REGION27_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_26_27, CM_RGAM_RAMB_EXP_REGION27_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_28_29, CM_RGAM_RAMB_EXP_REGION28_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_28_29, CM_RGAM_RAMB_EXP_REGION28_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_28_29, CM_RGAM_RAMB_EXP_REGION29_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_28_29, CM_RGAM_RAMB_EXP_REGION29_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_30_31, CM_RGAM_RAMB_EXP_REGION30_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_30_31, CM_RGAM_RAMB_EXP_REGION30_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_30_31, CM_RGAM_RAMB_EXP_REGION31_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMB_REGION_30_31, CM_RGAM_RAMB_EXP_REGION31_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMB_REGION_32_33, CM_RGAM_RAMB_EXP_REGION32_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMB_REGION_32_33, CM_RGAM_RAMB_EXP_REGION32_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMB_REGION_32_33, CM_RGAM_RAMB_EXP_REGION33_LUT_OFFSET, mask_sh), \ +@@ -587,66 +437,6 @@ + TF_SF(CM0_CM_RGAM_RAMA_REGION_0_1, CM_RGAM_RAMA_EXP_REGION0_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMA_REGION_0_1, CM_RGAM_RAMA_EXP_REGION1_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMA_REGION_0_1, CM_RGAM_RAMA_EXP_REGION1_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_2_3, CM_RGAM_RAMA_EXP_REGION2_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_2_3, CM_RGAM_RAMA_EXP_REGION2_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_2_3, CM_RGAM_RAMA_EXP_REGION3_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_2_3, CM_RGAM_RAMA_EXP_REGION3_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_4_5, CM_RGAM_RAMA_EXP_REGION4_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_4_5, CM_RGAM_RAMA_EXP_REGION4_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_4_5, CM_RGAM_RAMA_EXP_REGION5_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_4_5, CM_RGAM_RAMA_EXP_REGION5_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_6_7, CM_RGAM_RAMA_EXP_REGION6_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_6_7, CM_RGAM_RAMA_EXP_REGION6_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_6_7, CM_RGAM_RAMA_EXP_REGION7_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_6_7, CM_RGAM_RAMA_EXP_REGION7_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_8_9, CM_RGAM_RAMA_EXP_REGION8_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_8_9, CM_RGAM_RAMA_EXP_REGION8_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_8_9, CM_RGAM_RAMA_EXP_REGION9_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_8_9, CM_RGAM_RAMA_EXP_REGION9_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_10_11, CM_RGAM_RAMA_EXP_REGION10_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_10_11, CM_RGAM_RAMA_EXP_REGION10_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_10_11, CM_RGAM_RAMA_EXP_REGION11_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_10_11, CM_RGAM_RAMA_EXP_REGION11_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_12_13, CM_RGAM_RAMA_EXP_REGION12_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_12_13, CM_RGAM_RAMA_EXP_REGION12_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_12_13, CM_RGAM_RAMA_EXP_REGION13_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_12_13, CM_RGAM_RAMA_EXP_REGION13_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_14_15, CM_RGAM_RAMA_EXP_REGION14_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_14_15, CM_RGAM_RAMA_EXP_REGION14_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_14_15, CM_RGAM_RAMA_EXP_REGION15_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_14_15, CM_RGAM_RAMA_EXP_REGION15_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_16_17, CM_RGAM_RAMA_EXP_REGION16_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_16_17, CM_RGAM_RAMA_EXP_REGION16_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_16_17, CM_RGAM_RAMA_EXP_REGION17_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_16_17, CM_RGAM_RAMA_EXP_REGION17_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_18_19, CM_RGAM_RAMA_EXP_REGION18_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_18_19, CM_RGAM_RAMA_EXP_REGION18_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_18_19, CM_RGAM_RAMA_EXP_REGION19_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_18_19, CM_RGAM_RAMA_EXP_REGION19_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_20_21, CM_RGAM_RAMA_EXP_REGION20_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_20_21, CM_RGAM_RAMA_EXP_REGION20_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_20_21, CM_RGAM_RAMA_EXP_REGION21_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_20_21, CM_RGAM_RAMA_EXP_REGION21_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_22_23, CM_RGAM_RAMA_EXP_REGION22_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_22_23, CM_RGAM_RAMA_EXP_REGION22_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_22_23, CM_RGAM_RAMA_EXP_REGION23_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_22_23, CM_RGAM_RAMA_EXP_REGION23_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_24_25, CM_RGAM_RAMA_EXP_REGION24_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_24_25, CM_RGAM_RAMA_EXP_REGION24_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_24_25, CM_RGAM_RAMA_EXP_REGION25_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_24_25, CM_RGAM_RAMA_EXP_REGION25_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_26_27, CM_RGAM_RAMA_EXP_REGION26_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_26_27, CM_RGAM_RAMA_EXP_REGION26_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_26_27, CM_RGAM_RAMA_EXP_REGION27_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_26_27, CM_RGAM_RAMA_EXP_REGION27_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_28_29, CM_RGAM_RAMA_EXP_REGION28_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_28_29, CM_RGAM_RAMA_EXP_REGION28_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_28_29, CM_RGAM_RAMA_EXP_REGION29_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_28_29, CM_RGAM_RAMA_EXP_REGION29_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_30_31, CM_RGAM_RAMA_EXP_REGION30_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_30_31, CM_RGAM_RAMA_EXP_REGION30_NUM_SEGMENTS, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_30_31, CM_RGAM_RAMA_EXP_REGION31_LUT_OFFSET, mask_sh), \ +- TF_SF(CM0_CM_RGAM_RAMA_REGION_30_31, CM_RGAM_RAMA_EXP_REGION31_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMA_REGION_32_33, CM_RGAM_RAMA_EXP_REGION32_LUT_OFFSET, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMA_REGION_32_33, CM_RGAM_RAMA_EXP_REGION32_NUM_SEGMENTS, mask_sh), \ + TF_SF(CM0_CM_RGAM_RAMA_REGION_32_33, CM_RGAM_RAMA_EXP_REGION33_LUT_OFFSET, mask_sh), \ +@@ -816,66 +606,6 @@ + type CM_RGAM_RAMB_EXP_REGION0_NUM_SEGMENTS; \ + type CM_RGAM_RAMB_EXP_REGION1_LUT_OFFSET; \ + type CM_RGAM_RAMB_EXP_REGION1_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION2_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION2_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION3_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION3_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION4_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION4_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION5_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION5_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION6_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION6_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION7_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION7_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION8_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION8_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION9_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION9_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION10_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION10_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION11_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION11_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION12_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION12_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION13_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION13_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION14_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION14_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION15_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION15_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION16_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION16_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION17_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION17_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION18_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION18_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION19_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION19_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION20_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION20_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION21_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION21_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION22_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION22_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION23_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION23_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION24_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION24_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION25_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION25_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION26_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION26_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION27_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION27_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION28_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION28_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION29_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION29_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION30_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION30_NUM_SEGMENTS; \ +- type CM_RGAM_RAMB_EXP_REGION31_LUT_OFFSET; \ +- type CM_RGAM_RAMB_EXP_REGION31_NUM_SEGMENTS; \ + type CM_RGAM_RAMB_EXP_REGION32_LUT_OFFSET; \ + type CM_RGAM_RAMB_EXP_REGION32_NUM_SEGMENTS; \ + type CM_RGAM_RAMB_EXP_REGION33_LUT_OFFSET; \ +@@ -902,66 +632,6 @@ + type CM_RGAM_RAMA_EXP_REGION0_NUM_SEGMENTS; \ + type CM_RGAM_RAMA_EXP_REGION1_LUT_OFFSET; \ + type CM_RGAM_RAMA_EXP_REGION1_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION2_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION2_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION3_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION3_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION4_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION4_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION5_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION5_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION6_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION6_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION7_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION7_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION8_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION8_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION9_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION9_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION10_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION10_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION11_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION11_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION12_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION12_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION13_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION13_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION14_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION14_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION15_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION15_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION16_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION16_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION17_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION17_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION18_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION18_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION19_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION19_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION20_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION20_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION21_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION21_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION22_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION22_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION23_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION23_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION24_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION24_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION25_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION25_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION26_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION26_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION27_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION27_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION28_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION28_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION29_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION29_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION30_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION30_NUM_SEGMENTS; \ +- type CM_RGAM_RAMA_EXP_REGION31_LUT_OFFSET; \ +- type CM_RGAM_RAMA_EXP_REGION31_NUM_SEGMENTS; \ + type CM_RGAM_RAMA_EXP_REGION32_LUT_OFFSET; \ + type CM_RGAM_RAMA_EXP_REGION32_NUM_SEGMENTS; \ + type CM_RGAM_RAMA_EXP_REGION33_LUT_OFFSET; \ +@@ -1370,30 +1040,6 @@ + type CM_DGAM_RAMB_EXP_REGION0_NUM_SEGMENTS; \ + type CM_DGAM_RAMB_EXP_REGION1_LUT_OFFSET; \ + type CM_DGAM_RAMB_EXP_REGION1_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION2_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION2_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION3_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION3_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION4_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION4_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION5_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION5_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION6_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION6_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION7_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION7_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION8_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION8_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION9_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION9_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION10_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION10_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION11_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION11_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION12_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION12_NUM_SEGMENTS; \ +- type CM_DGAM_RAMB_EXP_REGION13_LUT_OFFSET; \ +- type CM_DGAM_RAMB_EXP_REGION13_NUM_SEGMENTS; \ + type CM_DGAM_RAMB_EXP_REGION14_LUT_OFFSET; \ + type CM_DGAM_RAMB_EXP_REGION14_NUM_SEGMENTS; \ + type CM_DGAM_RAMB_EXP_REGION15_LUT_OFFSET; \ +@@ -1420,30 +1066,6 @@ + type CM_DGAM_RAMA_EXP_REGION0_NUM_SEGMENTS; \ + type CM_DGAM_RAMA_EXP_REGION1_LUT_OFFSET; \ + type CM_DGAM_RAMA_EXP_REGION1_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION2_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION2_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION3_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION3_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION4_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION4_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION5_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION5_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION6_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION6_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION7_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION7_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION8_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION8_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION9_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION9_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION10_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION10_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION11_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION11_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION12_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION12_NUM_SEGMENTS; \ +- type CM_DGAM_RAMA_EXP_REGION13_LUT_OFFSET; \ +- type CM_DGAM_RAMA_EXP_REGION13_NUM_SEGMENTS; \ + type CM_DGAM_RAMA_EXP_REGION14_LUT_OFFSET; \ + type CM_DGAM_RAMA_EXP_REGION14_NUM_SEGMENTS; \ + type CM_DGAM_RAMA_EXP_REGION15_LUT_OFFSET; \ +@@ -1565,21 +1187,6 @@ struct dcn_dpp_registers { + uint32_t CM_RGAM_RAMB_END_CNTL1_R; + uint32_t CM_RGAM_RAMB_END_CNTL2_R; + uint32_t CM_RGAM_RAMB_REGION_0_1; +- uint32_t CM_RGAM_RAMB_REGION_2_3; +- uint32_t CM_RGAM_RAMB_REGION_4_5; +- uint32_t CM_RGAM_RAMB_REGION_6_7; +- uint32_t CM_RGAM_RAMB_REGION_8_9; +- uint32_t CM_RGAM_RAMB_REGION_10_11; +- uint32_t CM_RGAM_RAMB_REGION_12_13; +- uint32_t CM_RGAM_RAMB_REGION_14_15; +- uint32_t CM_RGAM_RAMB_REGION_16_17; +- uint32_t CM_RGAM_RAMB_REGION_18_19; +- uint32_t CM_RGAM_RAMB_REGION_20_21; +- uint32_t CM_RGAM_RAMB_REGION_22_23; +- uint32_t CM_RGAM_RAMB_REGION_24_25; +- uint32_t CM_RGAM_RAMB_REGION_26_27; +- uint32_t CM_RGAM_RAMB_REGION_28_29; +- uint32_t CM_RGAM_RAMB_REGION_30_31; + uint32_t CM_RGAM_RAMB_REGION_32_33; + uint32_t CM_RGAM_RAMA_START_CNTL_B; + uint32_t CM_RGAM_RAMA_START_CNTL_G; +@@ -1594,21 +1201,6 @@ struct dcn_dpp_registers { + uint32_t CM_RGAM_RAMA_END_CNTL1_R; + uint32_t CM_RGAM_RAMA_END_CNTL2_R; + uint32_t CM_RGAM_RAMA_REGION_0_1; +- uint32_t CM_RGAM_RAMA_REGION_2_3; +- uint32_t CM_RGAM_RAMA_REGION_4_5; +- uint32_t CM_RGAM_RAMA_REGION_6_7; +- uint32_t CM_RGAM_RAMA_REGION_8_9; +- uint32_t CM_RGAM_RAMA_REGION_10_11; +- uint32_t CM_RGAM_RAMA_REGION_12_13; +- uint32_t CM_RGAM_RAMA_REGION_14_15; +- uint32_t CM_RGAM_RAMA_REGION_16_17; +- uint32_t CM_RGAM_RAMA_REGION_18_19; +- uint32_t CM_RGAM_RAMA_REGION_20_21; +- uint32_t CM_RGAM_RAMA_REGION_22_23; +- uint32_t CM_RGAM_RAMA_REGION_24_25; +- uint32_t CM_RGAM_RAMA_REGION_26_27; +- uint32_t CM_RGAM_RAMA_REGION_28_29; +- uint32_t CM_RGAM_RAMA_REGION_30_31; + uint32_t CM_RGAM_RAMA_REGION_32_33; + uint32_t CM_RGAM_CONTROL; + uint32_t OBUF_CONTROL; +@@ -1743,12 +1335,6 @@ struct dcn_dpp_registers { + uint32_t CM_DGAM_RAMB_END_CNTL1_R; + uint32_t CM_DGAM_RAMB_END_CNTL2_R; + uint32_t CM_DGAM_RAMB_REGION_0_1; +- uint32_t CM_DGAM_RAMB_REGION_2_3; +- uint32_t CM_DGAM_RAMB_REGION_4_5; +- uint32_t CM_DGAM_RAMB_REGION_6_7; +- uint32_t CM_DGAM_RAMB_REGION_8_9; +- uint32_t CM_DGAM_RAMB_REGION_10_11; +- uint32_t CM_DGAM_RAMB_REGION_12_13; + uint32_t CM_DGAM_RAMB_REGION_14_15; + uint32_t CM_DGAM_RAMA_START_CNTL_B; + uint32_t CM_DGAM_RAMA_START_CNTL_G; +@@ -1763,12 +1349,6 @@ struct dcn_dpp_registers { + uint32_t CM_DGAM_RAMA_END_CNTL1_R; + uint32_t CM_DGAM_RAMA_END_CNTL2_R; + uint32_t CM_DGAM_RAMA_REGION_0_1; +- uint32_t CM_DGAM_RAMA_REGION_2_3; +- uint32_t CM_DGAM_RAMA_REGION_4_5; +- uint32_t CM_DGAM_RAMA_REGION_6_7; +- uint32_t CM_DGAM_RAMA_REGION_8_9; +- uint32_t CM_DGAM_RAMA_REGION_10_11; +- uint32_t CM_DGAM_RAMA_REGION_12_13; + uint32_t CM_DGAM_RAMA_REGION_14_15; + uint32_t CM_DGAM_LUT_WRITE_EN_MASK; + uint32_t CM_DGAM_LUT_INDEX; +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c +index 8162024..01b1c0e 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c +@@ -453,331 +453,145 @@ void dcn10_dpp_cm_configure_regamma_lut( + REG_SET(CM_RGAM_LUT_INDEX, 0, CM_RGAM_LUT_INDEX, 0); + } + +-/*program re gamma RAM A*/ +-void dcn10_dpp_cm_program_regamma_luta_settings( ++struct cm_gam_ram_reg { ++ uint32_t start_cntl_b; ++ uint32_t start_cntl_g; ++ uint32_t start_cntl_r; ++ uint32_t start_slope_cntl_b; ++ uint32_t start_slope_cntl_g; ++ uint32_t start_slope_cntl_r; ++ uint32_t start_end_cntl1_b; ++ uint32_t start_end_cntl2_b; ++ uint32_t start_end_cntl1_g; ++ uint32_t start_end_cntl2_g; ++ uint32_t start_end_cntl1_r; ++ uint32_t start_end_cntl2_r; ++ uint32_t region_start; ++ uint32_t region_end; ++}; ++ ++static void dpp_cm_program_region_lut( + struct transform *xfm_base, +- const struct pwl_params *params) ++ const struct pwl_params *params, ++ const struct cm_gam_ram_reg *reg) + { +- const struct gamma_curve *curve; + struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base); ++ uint32_t reg_region_cur; ++ unsigned int i = 0; ++ ++#undef REG ++#define REG(reg) reg + +- REG_SET_2(CM_RGAM_RAMA_START_CNTL_B, 0, ++ REG_SET_2(reg->start_cntl_b, 0, + CM_RGAM_RAMA_EXP_REGION_START_B, params->arr_points[0].custom_float_x, + CM_RGAM_RAMA_EXP_REGION_START_SEGMENT_B, 0); +- REG_SET_2(CM_RGAM_RAMA_START_CNTL_G, 0, ++ REG_SET_2(reg->start_cntl_g, 0, + CM_RGAM_RAMA_EXP_REGION_START_G, params->arr_points[0].custom_float_x, + CM_RGAM_RAMA_EXP_REGION_START_SEGMENT_G, 0); +- REG_SET_2(CM_RGAM_RAMA_START_CNTL_R, 0, ++ REG_SET_2(reg->start_cntl_r, 0, + CM_RGAM_RAMA_EXP_REGION_START_R, params->arr_points[0].custom_float_x, + CM_RGAM_RAMA_EXP_REGION_START_SEGMENT_R, 0); + +- REG_SET(CM_RGAM_RAMA_SLOPE_CNTL_B, 0, ++ REG_SET(reg->start_slope_cntl_b, 0, + CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope); +- REG_SET(CM_RGAM_RAMA_SLOPE_CNTL_G, 0, ++ REG_SET(reg->start_slope_cntl_g, 0, + CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_G, params->arr_points[0].custom_float_slope); +- REG_SET(CM_RGAM_RAMA_SLOPE_CNTL_R, 0, ++ REG_SET(reg->start_slope_cntl_r, 0, + CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope); + +- REG_SET(CM_RGAM_RAMA_END_CNTL1_B, 0, ++ REG_SET(reg->start_end_cntl1_b, 0, + CM_RGAM_RAMA_EXP_REGION_END_B, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMA_END_CNTL2_B, 0, ++ REG_SET_2(reg->start_end_cntl2_b, 0, + CM_RGAM_RAMA_EXP_REGION_END_SLOPE_B, params->arr_points[1].custom_float_slope, + CM_RGAM_RAMA_EXP_REGION_END_BASE_B, params->arr_points[1].custom_float_y); + +- REG_SET(CM_RGAM_RAMA_END_CNTL1_G, 0, ++ REG_SET(reg->start_end_cntl1_g, 0, + CM_RGAM_RAMA_EXP_REGION_END_G, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMA_END_CNTL2_G, 0, ++ REG_SET_2(reg->start_end_cntl2_g, 0, + CM_RGAM_RAMA_EXP_REGION_END_SLOPE_G, params->arr_points[1].custom_float_slope, + CM_RGAM_RAMA_EXP_REGION_END_BASE_G, params->arr_points[1].custom_float_y); + +- REG_SET(CM_RGAM_RAMA_END_CNTL1_R, 0, ++ REG_SET(reg->start_end_cntl1_r, 0, + CM_RGAM_RAMA_EXP_REGION_END_R, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMA_END_CNTL2_R, 0, ++ REG_SET_2(reg->start_end_cntl2_r, 0, + CM_RGAM_RAMA_EXP_REGION_END_SLOPE_R, params->arr_points[1].custom_float_slope, + CM_RGAM_RAMA_EXP_REGION_END_BASE_R, params->arr_points[1].custom_float_y); + +- curve = params->arr_curve_points; +- REG_SET_4(CM_RGAM_RAMA_REGION_0_1, 0, +- CM_RGAM_RAMA_EXP_REGION0_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION0_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION1_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION1_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_2_3, 0, +- CM_RGAM_RAMA_EXP_REGION2_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION2_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION3_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION3_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_4_5, 0, +- CM_RGAM_RAMA_EXP_REGION4_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION4_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION5_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION5_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_6_7, 0, +- CM_RGAM_RAMA_EXP_REGION6_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION6_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION7_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION7_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_8_9, 0, +- CM_RGAM_RAMA_EXP_REGION8_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION8_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION9_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION9_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_10_11, 0, +- CM_RGAM_RAMA_EXP_REGION10_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION10_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION11_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION11_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_12_13, 0, +- CM_RGAM_RAMA_EXP_REGION12_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION12_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION13_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION13_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_14_15, 0, +- CM_RGAM_RAMA_EXP_REGION14_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION14_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION15_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION15_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_16_17, 0, +- CM_RGAM_RAMA_EXP_REGION16_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION16_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION17_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION17_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_18_19, 0, +- CM_RGAM_RAMA_EXP_REGION18_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION18_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION19_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION19_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_20_21, 0, +- CM_RGAM_RAMA_EXP_REGION20_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION20_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION21_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION21_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_22_23, 0, +- CM_RGAM_RAMA_EXP_REGION22_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION22_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION23_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION23_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_24_25, 0, +- CM_RGAM_RAMA_EXP_REGION24_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION24_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION25_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION25_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_26_27, 0, +- CM_RGAM_RAMA_EXP_REGION26_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION26_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION27_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION27_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_28_29, 0, +- CM_RGAM_RAMA_EXP_REGION28_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION28_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION29_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION29_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_30_31, 0, +- CM_RGAM_RAMA_EXP_REGION30_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION30_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION31_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION31_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMA_REGION_32_33, 0, +- CM_RGAM_RAMA_EXP_REGION32_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMA_EXP_REGION32_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMA_EXP_REGION33_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMA_EXP_REGION33_NUM_SEGMENTS, curve[1].segments_num); ++ for (reg_region_cur = reg->region_start; ++ reg_region_cur <= reg->region_end; ++ reg_region_cur++) { ++ ++ const struct gamma_curve *curve0 = &(params->arr_curve_points[2 * i]); ++ const struct gamma_curve *curve1 = &(params->arr_curve_points[(2 * i) + 1]); ++ ++ REG_SET_4(reg_region_cur, 0, ++ CM_RGAM_RAMA_EXP_REGION0_LUT_OFFSET, curve0->offset, ++ CM_RGAM_RAMA_EXP_REGION0_NUM_SEGMENTS, curve0->segments_num, ++ CM_RGAM_RAMA_EXP_REGION1_LUT_OFFSET, curve1->offset, ++ CM_RGAM_RAMA_EXP_REGION1_NUM_SEGMENTS, curve1->segments_num); ++ ++ i++; ++ } ++ ++#undef REG ++#define REG(reg)\ ++ xfm->tf_regs->reg ++ + } + +-/*program re gamma RAM B*/ +-void dcn10_dpp_cm_program_regamma_lutb_settings( ++ ++ ++/*program re gamma RAM A*/ ++void dcn10_dpp_cm_program_regamma_luta_settings( + struct transform *xfm_base, + const struct pwl_params *params) + { +- const struct gamma_curve *curve; + struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base); ++ struct cm_gam_ram_reg gam_regs; ++ ++ gam_regs.start_cntl_b = REG(CM_RGAM_RAMA_START_CNTL_B); ++ gam_regs.start_cntl_g = REG(CM_RGAM_RAMA_START_CNTL_G); ++ gam_regs.start_cntl_r = REG(CM_RGAM_RAMA_START_CNTL_R); ++ gam_regs.start_slope_cntl_b = REG(CM_RGAM_RAMA_SLOPE_CNTL_B); ++ gam_regs.start_slope_cntl_g = REG(CM_RGAM_RAMA_SLOPE_CNTL_G); ++ gam_regs.start_slope_cntl_r = REG(CM_RGAM_RAMA_SLOPE_CNTL_R); ++ gam_regs.start_end_cntl1_b = REG(CM_RGAM_RAMA_END_CNTL1_B); ++ gam_regs.start_end_cntl2_b = REG(CM_RGAM_RAMA_END_CNTL2_B); ++ gam_regs.start_end_cntl1_g = REG(CM_RGAM_RAMA_END_CNTL1_G); ++ gam_regs.start_end_cntl2_g = REG(CM_RGAM_RAMA_END_CNTL2_G); ++ gam_regs.start_end_cntl1_r = REG(CM_RGAM_RAMA_END_CNTL1_R); ++ gam_regs.start_end_cntl2_r = REG(CM_RGAM_RAMA_END_CNTL2_R); ++ gam_regs.region_start = REG(CM_RGAM_RAMA_REGION_0_1); ++ gam_regs.region_end = REG(CM_RGAM_RAMA_REGION_32_33); ++ ++ dpp_cm_program_region_lut(xfm_base, params, &gam_regs); + +- REG_SET_2(CM_RGAM_RAMB_START_CNTL_B, 0, +- CM_RGAM_RAMB_EXP_REGION_START_B, params->arr_points[0].custom_float_x, +- CM_RGAM_RAMB_EXP_REGION_START_SEGMENT_B, 0); +- REG_SET_2(CM_RGAM_RAMB_START_CNTL_G, 0, +- CM_RGAM_RAMB_EXP_REGION_START_G, params->arr_points[0].custom_float_x, +- CM_RGAM_RAMB_EXP_REGION_START_SEGMENT_G, 0); +- REG_SET_2(CM_RGAM_RAMB_START_CNTL_R, 0, +- CM_RGAM_RAMB_EXP_REGION_START_R, params->arr_points[0].custom_float_x, +- CM_RGAM_RAMB_EXP_REGION_START_SEGMENT_R, 0); +- +- REG_SET(CM_RGAM_RAMB_SLOPE_CNTL_B, 0, +- CM_RGAM_RAMB_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope); +- REG_SET(CM_RGAM_RAMB_SLOPE_CNTL_G, 0, +- CM_RGAM_RAMB_EXP_REGION_LINEAR_SLOPE_G, params->arr_points[0].custom_float_slope); +- REG_SET(CM_RGAM_RAMB_SLOPE_CNTL_R, 0, +- CM_RGAM_RAMB_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_RGAM_RAMB_END_CNTL1_B, 0, +- CM_RGAM_RAMB_EXP_REGION_END_B, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMB_END_CNTL2_B, 0, +- CM_RGAM_RAMB_EXP_REGION_END_SLOPE_B, params->arr_points[1].custom_float_slope, +- CM_RGAM_RAMB_EXP_REGION_END_BASE_B, params->arr_points[1].custom_float_y); +- +- REG_SET(CM_RGAM_RAMB_END_CNTL1_G, 0, +- CM_RGAM_RAMB_EXP_REGION_END_G, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMB_END_CNTL2_G, 0, +- CM_RGAM_RAMB_EXP_REGION_END_SLOPE_G, params->arr_points[1].custom_float_slope, +- CM_RGAM_RAMB_EXP_REGION_END_BASE_G, params->arr_points[1].custom_float_y); +- +- REG_SET(CM_RGAM_RAMB_END_CNTL1_R, 0, +- CM_RGAM_RAMB_EXP_REGION_END_R, params->arr_points[1].custom_float_x); +- REG_SET_2(CM_RGAM_RAMB_END_CNTL2_R, 0, +- CM_RGAM_RAMB_EXP_REGION_END_SLOPE_R, params->arr_points[1].custom_float_slope, +- CM_RGAM_RAMB_EXP_REGION_END_BASE_R, params->arr_points[1].custom_float_y); +- +- curve = params->arr_curve_points; +- REG_SET_4(CM_RGAM_RAMB_REGION_0_1, 0, +- CM_RGAM_RAMB_EXP_REGION0_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION0_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION1_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION1_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_2_3, 0, +- CM_RGAM_RAMB_EXP_REGION2_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION2_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION3_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION3_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_4_5, 0, +- CM_RGAM_RAMB_EXP_REGION4_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION4_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION5_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION5_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_6_7, 0, +- CM_RGAM_RAMB_EXP_REGION6_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION6_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION7_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION7_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_8_9, 0, +- CM_RGAM_RAMB_EXP_REGION8_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION8_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION9_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION9_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_10_11, 0, +- CM_RGAM_RAMB_EXP_REGION10_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION10_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION11_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION11_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_12_13, 0, +- CM_RGAM_RAMB_EXP_REGION12_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION12_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION13_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION13_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_14_15, 0, +- CM_RGAM_RAMB_EXP_REGION14_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION14_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION15_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION15_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_16_17, 0, +- CM_RGAM_RAMB_EXP_REGION16_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION16_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION17_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION17_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_18_19, 0, +- CM_RGAM_RAMB_EXP_REGION18_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION18_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION19_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION19_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_20_21, 0, +- CM_RGAM_RAMB_EXP_REGION20_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION20_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION21_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION21_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_22_23, 0, +- CM_RGAM_RAMB_EXP_REGION22_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION22_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION23_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION23_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_24_25, 0, +- CM_RGAM_RAMB_EXP_REGION24_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION24_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION25_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION25_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_26_27, 0, +- CM_RGAM_RAMB_EXP_REGION26_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION26_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION27_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION27_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_28_29, 0, +- CM_RGAM_RAMB_EXP_REGION28_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION28_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION29_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION29_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_30_31, 0, +- CM_RGAM_RAMB_EXP_REGION30_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION30_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION31_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION31_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_RGAM_RAMB_REGION_32_33, 0, +- CM_RGAM_RAMB_EXP_REGION32_LUT_OFFSET, curve[0].offset, +- CM_RGAM_RAMB_EXP_REGION32_NUM_SEGMENTS, curve[0].segments_num, +- CM_RGAM_RAMB_EXP_REGION33_LUT_OFFSET, curve[1].offset, +- CM_RGAM_RAMB_EXP_REGION33_NUM_SEGMENTS, curve[1].segments_num); ++} + ++/*program re gamma RAM B*/ ++void dcn10_dpp_cm_program_regamma_lutb_settings( ++ struct transform *xfm_base, ++ const struct pwl_params *params) ++{ ++ struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base); ++ struct cm_gam_ram_reg gam_regs; ++ ++ gam_regs.start_cntl_b = REG(CM_RGAM_RAMB_START_CNTL_B); ++ gam_regs.start_cntl_g = REG(CM_RGAM_RAMB_START_CNTL_G); ++ gam_regs.start_cntl_r = REG(CM_RGAM_RAMB_START_CNTL_R); ++ gam_regs.start_slope_cntl_b = REG(CM_RGAM_RAMB_SLOPE_CNTL_B); ++ gam_regs.start_slope_cntl_g = REG(CM_RGAM_RAMB_SLOPE_CNTL_G); ++ gam_regs.start_slope_cntl_r = REG(CM_RGAM_RAMB_SLOPE_CNTL_R); ++ gam_regs.start_end_cntl1_b = REG(CM_RGAM_RAMB_END_CNTL1_B); ++ gam_regs.start_end_cntl2_b = REG(CM_RGAM_RAMB_END_CNTL2_B); ++ gam_regs.start_end_cntl1_g = REG(CM_RGAM_RAMB_END_CNTL1_G); ++ gam_regs.start_end_cntl2_g = REG(CM_RGAM_RAMB_END_CNTL2_G); ++ gam_regs.start_end_cntl1_r = REG(CM_RGAM_RAMB_END_CNTL1_R); ++ gam_regs.start_end_cntl2_r = REG(CM_RGAM_RAMB_END_CNTL2_R); ++ gam_regs.region_start = REG(CM_RGAM_RAMB_REGION_0_1); ++ gam_regs.region_end = REG(CM_RGAM_RAMB_REGION_32_33); ++ ++ dpp_cm_program_region_lut(xfm_base, params, &gam_regs); + } + + void ippn10_program_input_csc( +@@ -874,106 +688,25 @@ void ippn10_program_degamma_lutb_settings( + struct transform *xfm_base, + const struct pwl_params *params) + { +- const struct gamma_curve *curve; + struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base); +- +- REG_SET_2(CM_DGAM_RAMB_START_CNTL_B, 0, +- CM_DGAM_RAMB_EXP_REGION_START_B, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMB_EXP_REGION_START_SEGMENT_B, 0); +- +- REG_SET_2(CM_DGAM_RAMB_START_CNTL_G, 0, +- CM_DGAM_RAMB_EXP_REGION_START_G, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMB_EXP_REGION_START_SEGMENT_G, 0); +- +- REG_SET_2(CM_DGAM_RAMB_START_CNTL_R, 0, +- CM_DGAM_RAMB_EXP_REGION_START_R, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMB_EXP_REGION_START_SEGMENT_R, 0); +- +- REG_SET(CM_DGAM_RAMB_SLOPE_CNTL_B, 0, +- CM_DGAM_RAMB_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMB_SLOPE_CNTL_G, 0, +- CM_DGAM_RAMB_EXP_REGION_LINEAR_SLOPE_G, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMB_SLOPE_CNTL_R, 0, +- CM_DGAM_RAMB_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMB_END_CNTL1_B, 0, +- CM_DGAM_RAMB_EXP_REGION_END_B, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMB_END_CNTL2_B, 0, +- CM_DGAM_RAMB_EXP_REGION_END_SLOPE_B, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMB_EXP_REGION_END_BASE_B, params->arr_points[2].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMB_END_CNTL1_G, 0, +- CM_DGAM_RAMB_EXP_REGION_END_G, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMB_END_CNTL2_G, 0, +- CM_DGAM_RAMB_EXP_REGION_END_SLOPE_G, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMB_EXP_REGION_END_BASE_G, params->arr_points[2].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMB_END_CNTL1_R, 0, +- CM_DGAM_RAMB_EXP_REGION_END_R, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMB_END_CNTL2_R, 0, +- CM_DGAM_RAMB_EXP_REGION_END_SLOPE_R, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMB_EXP_REGION_END_BASE_R, params->arr_points[2].custom_float_slope); +- +- curve = params->arr_curve_points; +- REG_SET_4(CM_DGAM_RAMB_REGION_0_1, 0, +- CM_DGAM_RAMB_EXP_REGION0_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION0_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION1_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION1_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_2_3, 0, +- CM_DGAM_RAMB_EXP_REGION2_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION2_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION3_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION3_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_4_5, 0, +- CM_DGAM_RAMB_EXP_REGION4_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION4_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION5_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION5_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_6_7, 0, +- CM_DGAM_RAMB_EXP_REGION6_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION6_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION7_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION7_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_8_9, 0, +- CM_DGAM_RAMB_EXP_REGION8_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION8_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION9_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION9_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_10_11, 0, +- CM_DGAM_RAMB_EXP_REGION10_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION10_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION11_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION11_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_12_13, 0, +- CM_DGAM_RAMB_EXP_REGION12_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION12_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION13_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION13_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMB_REGION_14_15, 0, +- CM_DGAM_RAMB_EXP_REGION14_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMB_EXP_REGION14_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMB_EXP_REGION15_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMB_EXP_REGION15_NUM_SEGMENTS, curve[1].segments_num); ++ struct cm_gam_ram_reg gam_regs; ++ ++ gam_regs.start_cntl_b = REG(CM_DGAM_RAMB_START_CNTL_B); ++ gam_regs.start_cntl_g = REG(CM_DGAM_RAMB_START_CNTL_G); ++ gam_regs.start_cntl_r = REG(CM_DGAM_RAMB_START_CNTL_R); ++ gam_regs.start_slope_cntl_b = REG(CM_DGAM_RAMB_SLOPE_CNTL_B); ++ gam_regs.start_slope_cntl_g = REG(CM_DGAM_RAMB_SLOPE_CNTL_G); ++ gam_regs.start_slope_cntl_r = REG(CM_DGAM_RAMB_SLOPE_CNTL_R); ++ gam_regs.start_end_cntl1_b = REG(CM_DGAM_RAMB_END_CNTL1_B); ++ gam_regs.start_end_cntl2_b = REG(CM_DGAM_RAMB_END_CNTL2_B); ++ gam_regs.start_end_cntl1_g = REG(CM_DGAM_RAMB_END_CNTL1_G); ++ gam_regs.start_end_cntl2_g = REG(CM_DGAM_RAMB_END_CNTL2_G); ++ gam_regs.start_end_cntl1_r = REG(CM_DGAM_RAMB_END_CNTL1_R); ++ gam_regs.start_end_cntl2_r = REG(CM_DGAM_RAMB_END_CNTL2_R); ++ gam_regs.region_start = REG(CM_DGAM_RAMB_REGION_0_1); ++ gam_regs.region_end = REG(CM_DGAM_RAMB_REGION_14_15); ++ ++ dpp_cm_program_region_lut(xfm_base, params, &gam_regs); + } + + /*program de gamma RAM A*/ +@@ -981,106 +714,25 @@ void ippn10_program_degamma_luta_settings( + struct transform *xfm_base, + const struct pwl_params *params) + { +- const struct gamma_curve *curve; + struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base); +- +- REG_SET_2(CM_DGAM_RAMA_START_CNTL_B, 0, +- CM_DGAM_RAMA_EXP_REGION_START_B, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMA_EXP_REGION_START_SEGMENT_B, 0); +- +- REG_SET_2(CM_DGAM_RAMA_START_CNTL_G, 0, +- CM_DGAM_RAMA_EXP_REGION_START_G, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMA_EXP_REGION_START_SEGMENT_G, 0); +- +- REG_SET_2(CM_DGAM_RAMA_START_CNTL_R, 0, +- CM_DGAM_RAMA_EXP_REGION_START_R, params->arr_points[0].custom_float_x, +- CM_DGAM_RAMA_EXP_REGION_START_SEGMENT_R, 0); +- +- REG_SET(CM_DGAM_RAMA_SLOPE_CNTL_B, 0, +- CM_DGAM_RAMA_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMA_SLOPE_CNTL_G, 0, +- CM_DGAM_RAMA_EXP_REGION_LINEAR_SLOPE_G, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMA_SLOPE_CNTL_R, 0, +- CM_DGAM_RAMA_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMA_END_CNTL1_B, 0, +- CM_DGAM_RAMA_EXP_REGION_END_B, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMA_END_CNTL2_B, 0, +- CM_DGAM_RAMA_EXP_REGION_END_SLOPE_B, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMA_EXP_REGION_END_BASE_B, params->arr_points[2].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMA_END_CNTL1_G, 0, +- CM_DGAM_RAMA_EXP_REGION_END_G, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMA_END_CNTL2_G, 0, +- CM_DGAM_RAMA_EXP_REGION_END_SLOPE_G, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMA_EXP_REGION_END_BASE_G, params->arr_points[2].custom_float_slope); +- +- REG_SET(CM_DGAM_RAMA_END_CNTL1_R, 0, +- CM_DGAM_RAMA_EXP_REGION_END_R, params->arr_points[1].custom_float_x); +- +- REG_SET_2(CM_DGAM_RAMA_END_CNTL2_R, 0, +- CM_DGAM_RAMA_EXP_REGION_END_SLOPE_R, params->arr_points[1].custom_float_y, +- CM_DGAM_RAMA_EXP_REGION_END_BASE_R, params->arr_points[2].custom_float_slope); +- +- curve = params->arr_curve_points; +- REG_SET_4(CM_DGAM_RAMA_REGION_0_1, 0, +- CM_DGAM_RAMA_EXP_REGION0_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION0_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION1_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION1_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_2_3, 0, +- CM_DGAM_RAMA_EXP_REGION2_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION2_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION3_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION3_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_4_5, 0, +- CM_DGAM_RAMA_EXP_REGION4_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION4_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION5_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION5_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_6_7, 0, +- CM_DGAM_RAMA_EXP_REGION6_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION6_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION7_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION7_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_8_9, 0, +- CM_DGAM_RAMA_EXP_REGION8_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION8_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION9_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION9_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_10_11, 0, +- CM_DGAM_RAMA_EXP_REGION10_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION10_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION11_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION11_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_12_13, 0, +- CM_DGAM_RAMA_EXP_REGION12_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION12_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION13_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION13_NUM_SEGMENTS, curve[1].segments_num); +- +- curve += 2; +- REG_SET_4(CM_DGAM_RAMA_REGION_14_15, 0, +- CM_DGAM_RAMA_EXP_REGION14_LUT_OFFSET, curve[0].offset, +- CM_DGAM_RAMA_EXP_REGION14_NUM_SEGMENTS, curve[0].segments_num, +- CM_DGAM_RAMA_EXP_REGION15_LUT_OFFSET, curve[1].offset, +- CM_DGAM_RAMA_EXP_REGION15_NUM_SEGMENTS, curve[1].segments_num); ++ struct cm_gam_ram_reg gam_regs; ++ ++ gam_regs.start_cntl_b = REG(CM_DGAM_RAMA_START_CNTL_B); ++ gam_regs.start_cntl_g = REG(CM_DGAM_RAMA_START_CNTL_G); ++ gam_regs.start_cntl_r = REG(CM_DGAM_RAMA_START_CNTL_R); ++ gam_regs.start_slope_cntl_b = REG(CM_DGAM_RAMA_SLOPE_CNTL_B); ++ gam_regs.start_slope_cntl_g = REG(CM_DGAM_RAMA_SLOPE_CNTL_G); ++ gam_regs.start_slope_cntl_r = REG(CM_DGAM_RAMA_SLOPE_CNTL_R); ++ gam_regs.start_end_cntl1_b = REG(CM_DGAM_RAMA_END_CNTL1_B); ++ gam_regs.start_end_cntl2_b = REG(CM_DGAM_RAMA_END_CNTL2_B); ++ gam_regs.start_end_cntl1_g = REG(CM_DGAM_RAMA_END_CNTL1_G); ++ gam_regs.start_end_cntl2_g = REG(CM_DGAM_RAMA_END_CNTL2_G); ++ gam_regs.start_end_cntl1_r = REG(CM_DGAM_RAMA_END_CNTL1_R); ++ gam_regs.start_end_cntl2_r = REG(CM_DGAM_RAMA_END_CNTL2_R); ++ gam_regs.region_start = REG(CM_DGAM_RAMA_REGION_0_1); ++ gam_regs.region_end = REG(CM_DGAM_RAMA_REGION_14_15); ++ ++ dpp_cm_program_region_lut(xfm_base, params, &gam_regs); + } + + void ippn10_power_on_degamma_lut( +-- +2.7.4 + |