Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 170
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 c8d7bd8b 编写于 作者: Y Yue Hin Lau 提交者： Alex Deucher
浏览文件
操作

drm/amd/display: move RGAM programming from opp to dpp 

Signed-off-by: NYue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: NTony Cheng <Tony.Cheng@amd.com>
Acked-by: NHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 e63825be
展开全部 隐藏空白更改
内联 并排
Showing with 972 addition and 938 deletion
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
浏览文件 @ c8d7bd8b
...@@ -1134,6 +1134,431 @@ static void oppn10_set_output_csc_adjustment( ...@@ -1134,6 +1134,431 @@ static void oppn10_set_output_csc_adjustment(
oppn10_program_color_matrix(xfm, tbl_entry); oppn10_program_color_matrix(xfm, tbl_entry);
} }
static void oppn10_power_on_regamma_lut(
struct transform *xfm_base,
bool power_on)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
REG_SET(CM_MEM_PWR_CTRL, 0,
RGAM_MEM_PWR_FORCE, power_on == true ? 0:1);
}
static void opp_program_regamma_lut(
struct transform *xfm_base,
const struct pwl_result_data *rgb,
uint32_t num)
{
uint32_t i;
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
for (i = 0 ; i < num; i++) {
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].red_reg);
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].green_reg);
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].blue_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_red_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_green_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_blue_reg);
}
}
static void opp_configure_regamma_lut(
struct transform *xfm_base,
bool is_ram_a)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
REG_UPDATE(CM_RGAM_LUT_WRITE_EN_MASK,
CM_RGAM_LUT_WRITE_EN_MASK, 7);
REG_UPDATE(CM_RGAM_LUT_WRITE_EN_MASK,
CM_RGAM_LUT_WRITE_SEL, is_ram_a == true ? 0:1);
REG_SET(CM_RGAM_LUT_INDEX, 0, CM_RGAM_LUT_INDEX, 0);
}
/*program re gamma RAM A*/
static void opp_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);
REG_SET_2(CM_RGAM_RAMA_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,
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,
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,
CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope);
REG_SET(CM_RGAM_RAMA_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,
CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope);
REG_SET(CM_RGAM_RAMA_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,
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,
CM_RGAM_RAMA_EXP_REGION_END_G, params->arr_points[1].custom_float_x);
REG_SET_2(CM_RGAM_RAMA_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,
CM_RGAM_RAMA_EXP_REGION_END_R, params->arr_points[1].custom_float_x);
REG_SET_2(CM_RGAM_RAMA_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);
}
/*program re gamma RAM B*/
static void opp_program_regamma_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_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);
}
static bool oppn10_set_regamma_pwl(
struct transform *xfm_base, const struct pwl_params *params)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
oppn10_power_on_regamma_lut(xfm_base, true);
opp_configure_regamma_lut(xfm_base, xfm->is_write_to_ram_a_safe);
if (xfm->is_write_to_ram_a_safe)
opp_program_regamma_luta_settings(xfm_base, params);
else
opp_program_regamma_lutb_settings(xfm_base, params);
opp_program_regamma_lut(
xfm_base, params->rgb_resulted, params->hw_points_num);
return true;
}
static void oppn10_set_regamma_mode(
struct transform *xfm_base,
enum opp_regamma mode)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
uint32_t re_mode = 0;
uint32_t obuf_bypass = 0; /* need for pipe split */
uint32_t obuf_hupscale = 0;
switch (mode) {
case OPP_REGAMMA_BYPASS:
re_mode = 0;
break;
case OPP_REGAMMA_SRGB:
re_mode = 1;
break;
case OPP_REGAMMA_3_6:
re_mode = 2;
break;
case OPP_REGAMMA_USER:
re_mode = xfm->is_write_to_ram_a_safe ? 3 : 4;
xfm->is_write_to_ram_a_safe = !xfm->is_write_to_ram_a_safe;
break;
default:
break;
}
REG_SET(CM_RGAM_CONTROL, 0, CM_RGAM_LUT_MODE, re_mode);
REG_UPDATE_2(OBUF_CONTROL,
OBUF_BYPASS, obuf_bypass,
OBUF_H_2X_UPSCALE_EN, obuf_hupscale);
}
static struct transform_funcs dcn10_dpp_funcs = { static struct transform_funcs dcn10_dpp_funcs = {
.transform_reset = dpp_reset, .transform_reset = dpp_reset,
.transform_set_scaler = dpp_set_scaler_manual_scale, .transform_set_scaler = dpp_set_scaler_manual_scale,
...@@ -1141,6 +1566,13 @@ static struct transform_funcs dcn10_dpp_funcs = { ...@@ -1141,6 +1566,13 @@ static struct transform_funcs dcn10_dpp_funcs = {
.transform_set_gamut_remap = dcn_dpp_set_gamut_remap, .transform_set_gamut_remap = dcn_dpp_set_gamut_remap,
.opp_set_csc_adjustment = oppn10_set_output_csc_adjustment, .opp_set_csc_adjustment = oppn10_set_output_csc_adjustment,
.opp_set_csc_default = oppn10_set_output_csc_default, .opp_set_csc_default = oppn10_set_output_csc_default,
.opp_power_on_regamma_lut = oppn10_power_on_regamma_lut,
.opp_program_regamma_lut = opp_program_regamma_lut,
.opp_configure_regamma_lut = opp_configure_regamma_lut,
.opp_program_regamma_lutb_settings = opp_program_regamma_lutb_settings,
.opp_program_regamma_luta_settings = opp_program_regamma_luta_settings,
.opp_program_regamma_pwl = oppn10_set_regamma_pwl,
.opp_set_regamma_mode = oppn10_set_regamma_mode
}; };
/*****************************************/ /*****************************************/
......
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
浏览文件 @ c8d7bd8b
...@@ -1054,25 +1054,25 @@ static bool dcn10_set_output_transfer_func( ...@@ -1054,25 +1054,25 @@ static bool dcn10_set_output_transfer_func(
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
const struct core_stream *stream) const struct core_stream *stream)
{ {
struct output_pixel_processor *opp = pipe_ctx->opp; struct transform *xfm = pipe_ctx->xfm;
if (opp == NULL) if (xfm == NULL)
return false; return false;
opp->regamma_params.hw_points_num = GAMMA_HW_POINTS_NUM; xfm->regamma_params.hw_points_num = GAMMA_HW_POINTS_NUM;
if (stream->public.out_transfer_func && if (stream->public.out_transfer_func &&
stream->public.out_transfer_func->type == stream->public.out_transfer_func->type ==
TF_TYPE_PREDEFINED && TF_TYPE_PREDEFINED &&
stream->public.out_transfer_func->tf == stream->public.out_transfer_func->tf ==
TRANSFER_FUNCTION_SRGB) { TRANSFER_FUNCTION_SRGB) {
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_SRGB); xfm->funcs->opp_set_regamma_mode(xfm, OPP_REGAMMA_SRGB);
} else if (dcn10_translate_regamma_to_hw_format( } else if (dcn10_translate_regamma_to_hw_format(
stream->public.out_transfer_func, &opp->regamma_params)) { stream->public.out_transfer_func, &xfm->regamma_params)) {
opp->funcs->opp_program_regamma_pwl(opp, &opp->regamma_params); xfm->funcs->opp_program_regamma_pwl(xfm, &xfm->regamma_params);
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_USER); xfm->funcs->opp_set_regamma_mode(xfm, OPP_REGAMMA_USER);
} else { } else {
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_BYPASS); xfm->funcs->opp_set_regamma_mode(xfm, OPP_REGAMMA_BYPASS);
} }
return true; return true;
......
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c
浏览文件 @ c8d7bd8b
...@@ -37,38 +37,7 @@ ...@@ -37,38 +37,7 @@
#define CTX \ #define CTX \
oppn10->base.ctx oppn10->base.ctx
static void oppn10_set_regamma_mode(
struct output_pixel_processor *opp,
enum opp_regamma mode)
{
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
uint32_t re_mode = 0;
uint32_t obuf_bypass = 0; /* need for pipe split */
uint32_t obuf_hupscale = 0;
switch (mode) {
case OPP_REGAMMA_BYPASS:
re_mode = 0;
break;
case OPP_REGAMMA_SRGB:
re_mode = 1;
break;
case OPP_REGAMMA_3_6:
re_mode = 2;
break;
case OPP_REGAMMA_USER:
re_mode = oppn10->is_write_to_ram_a_safe ? 3 : 4;
oppn10->is_write_to_ram_a_safe = !oppn10->is_write_to_ram_a_safe;
break;
default:
break;
}
REG_SET(CM_RGAM_CONTROL, 0, CM_RGAM_LUT_MODE, re_mode);
REG_UPDATE_2(OBUF_CONTROL,
OBUF_BYPASS, obuf_bypass,
OBUF_H_2X_UPSCALE_EN, obuf_hupscale);
}
/************* FORMATTER ************/ /************* FORMATTER ************/
...@@ -328,400 +297,6 @@ static void oppn10_program_fmt( ...@@ -328,400 +297,6 @@ static void oppn10_program_fmt(
} }
/*program re gamma RAM B*/
static void opp_program_regamma_lutb_settings(
struct output_pixel_processor *opp,
const struct pwl_params *params)
{
const struct gamma_curve *curve;
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
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 A*/
static void opp_program_regamma_luta_settings(
struct output_pixel_processor *opp,
const struct pwl_params *params)
{
const struct gamma_curve *curve;
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
REG_SET_2(CM_RGAM_RAMA_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,
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,
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,
CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_B, params->arr_points[0].custom_float_slope);
REG_SET(CM_RGAM_RAMA_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,
CM_RGAM_RAMA_EXP_REGION_LINEAR_SLOPE_R, params->arr_points[0].custom_float_slope);
REG_SET(CM_RGAM_RAMA_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,
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,
CM_RGAM_RAMA_EXP_REGION_END_G, params->arr_points[1].custom_float_x);
REG_SET_2(CM_RGAM_RAMA_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,
CM_RGAM_RAMA_EXP_REGION_END_R, params->arr_points[1].custom_float_x);
REG_SET_2(CM_RGAM_RAMA_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);
}
static void opp_configure_regamma_lut(
struct output_pixel_processor *opp,
bool is_ram_a)
{
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
REG_UPDATE(CM_RGAM_LUT_WRITE_EN_MASK,
CM_RGAM_LUT_WRITE_EN_MASK, 7);
REG_UPDATE(CM_RGAM_LUT_WRITE_EN_MASK,
CM_RGAM_LUT_WRITE_SEL, is_ram_a == true ? 0:1);
REG_SET(CM_RGAM_LUT_INDEX, 0, CM_RGAM_LUT_INDEX, 0);
}
static void oppn10_power_on_regamma_lut(
struct output_pixel_processor *opp,
bool power_on)
{
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
REG_SET(CM_MEM_PWR_CTRL, 0,
RGAM_MEM_PWR_FORCE, power_on == true ? 0:1);
}
static void opp_program_regamma_lut(
struct output_pixel_processor *opp,
const struct pwl_result_data *rgb,
uint32_t num)
{
uint32_t i;
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
for (i = 0 ; i < num; i++) {
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].red_reg);
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].green_reg);
REG_SET(CM_RGAM_LUT_DATA, 0, CM_RGAM_LUT_DATA, rgb[i].blue_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_red_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_green_reg);
REG_SET(CM_RGAM_LUT_DATA, 0,
CM_RGAM_LUT_DATA, rgb[i].delta_blue_reg);
}
}
static bool oppn10_set_regamma_pwl(
struct output_pixel_processor *opp, const struct pwl_params *params)
{
struct dcn10_opp *oppn10 = TO_DCN10_OPP(opp);
oppn10_power_on_regamma_lut(opp, true);
opp_configure_regamma_lut(opp, oppn10->is_write_to_ram_a_safe);
if (oppn10->is_write_to_ram_a_safe)
opp_program_regamma_luta_settings(opp, params);
else
opp_program_regamma_lutb_settings(opp, params);
opp_program_regamma_lut(
opp, params->rgb_resulted, params->hw_points_num);
return true;
}
static void oppn10_set_stereo_polarity( static void oppn10_set_stereo_polarity(
struct output_pixel_processor *opp, struct output_pixel_processor *opp,
...@@ -743,10 +318,7 @@ static void dcn10_opp_destroy(struct output_pixel_processor **opp) ...@@ -743,10 +318,7 @@ static void dcn10_opp_destroy(struct output_pixel_processor **opp)
} }
static struct opp_funcs dcn10_opp_funcs = { static struct opp_funcs dcn10_opp_funcs = {
.opp_power_on_regamma_lut = oppn10_power_on_regamma_lut,
.opp_set_dyn_expansion = oppn10_set_dyn_expansion, .opp_set_dyn_expansion = oppn10_set_dyn_expansion,
.opp_program_regamma_pwl = oppn10_set_regamma_pwl,
.opp_set_regamma_mode = oppn10_set_regamma_mode,
.opp_program_fmt = oppn10_program_fmt, .opp_program_fmt = oppn10_program_fmt,
.opp_program_bit_depth_reduction = oppn10_program_bit_depth_reduction, .opp_program_bit_depth_reduction = oppn10_program_bit_depth_reduction,
.opp_set_stereo_polarity = oppn10_set_stereo_polarity, .opp_set_stereo_polarity = oppn10_set_stereo_polarity,
......
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
浏览文件 @ c8d7bd8b
...@@ -113,4 +113,11 @@ struct out_csc_color_matrix { ...@@ -113,4 +113,11 @@ struct out_csc_color_matrix {
uint16_t regval[12]; uint16_t regval[12];
}; };
enum opp_regamma {
OPP_REGAMMA_BYPASS = 0,
OPP_REGAMMA_SRGB,
OPP_REGAMMA_3_6,
OPP_REGAMMA_USER
};
#endif /* __DAL_HW_SHARED_H__ */ #endif /* __DAL_HW_SHARED_H__ */
drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
浏览文件 @ c8d7bd8b
...@@ -196,13 +196,6 @@ struct pwl_float_data { ...@@ -196,13 +196,6 @@ struct pwl_float_data {
struct fixed31_32 b; struct fixed31_32 b;
}; };
enum opp_regamma {
OPP_REGAMMA_BYPASS = 0,
OPP_REGAMMA_SRGB,
OPP_REGAMMA_3_6,
OPP_REGAMMA_USER,
};
struct output_pixel_processor { struct output_pixel_processor {
struct dc_context *ctx; struct dc_context *ctx;
uint32_t inst; uint32_t inst;
......
drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
浏览文件 @ c8d7bd8b
...@@ -38,6 +38,7 @@ struct transform { ...@@ -38,6 +38,7 @@ struct transform {
const struct transform_funcs *funcs; const struct transform_funcs *funcs;
struct dc_context *ctx; struct dc_context *ctx;
int inst; int inst;
struct pwl_params regamma_params;
}; };
/* Colorimetry */ /* Colorimetry */
...@@ -190,6 +191,34 @@ struct transform_funcs { ...@@ -190,6 +191,34 @@ struct transform_funcs {
void (*opp_set_csc_adjustment)( void (*opp_set_csc_adjustment)(
struct transform *xfm, struct transform *xfm,
const struct out_csc_color_matrix *tbl_entry); const struct out_csc_color_matrix *tbl_entry);
void (*opp_power_on_regamma_lut)(
struct transform *xfm,
bool power_on);
void (*opp_program_regamma_lut)(
struct transform *xfm,
const struct pwl_result_data *rgb,
uint32_t num);
void (*opp_configure_regamma_lut)(
struct transform *xfm,
bool is_ram_a);
void (*opp_program_regamma_lutb_settings)(
struct transform *xfm,
const struct pwl_params *params);
void (*opp_program_regamma_luta_settings)(
struct transform *xfm,
const struct pwl_params *params);
bool (*opp_program_regamma_pwl)(
struct transform *xfm, const struct pwl_params *params);
void (*opp_set_regamma_mode)(
struct transform *xfm_base,
enum opp_regamma mode);
}; };
extern const uint16_t filter_2tap_16p[18]; extern const uint16_t filter_2tap_16p[18];
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或