GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

exynos: video: Rename variables for driver model

Browse source 
Use 'priv' for a private pointer and 'regs' for a register pointer.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Simon Glass 2016-02-21 21:09:00 -07:00 • committed by Minkyu Kang
parent 21f8f9bb08
commit 8b449a6639
5 changed files with 369 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

434
drivers/video/exynos/exynos_dp.c
View file

@ -33,20 +33,20 @@ static void exynos_dp_disp_info(struct edp_disp_info *disp_info)
return; return;
} }
static int exynos_dp_init_dp(struct exynos_dp *dp_regs) static int exynos_dp_init_dp(struct exynos_dp *regs)
{ {
int ret; int ret;
exynos_dp_reset(dp_regs); exynos_dp_reset(regs);
/* SW defined function Normal operation */ /* SW defined function Normal operation */
exynos_dp_enable_sw_func(dp_regs, DP_ENABLE); exynos_dp_enable_sw_func(regs, DP_ENABLE);
ret = exynos_dp_init_analog_func(dp_regs); ret = exynos_dp_init_analog_func(regs);
if (ret != EXYNOS_DP_SUCCESS) if (ret != EXYNOS_DP_SUCCESS)
return ret; return ret;
exynos_dp_init_hpd(dp_regs); exynos_dp_init_hpd(regs);
exynos_dp_init_aux(dp_regs); exynos_dp_init_aux(regs);
return ret; return ret;
} }
@ -62,7 +62,7 @@ static unsigned char exynos_dp_calc_edid_check_sum(unsigned char *edid_data)
return sum; return sum;
} }
static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs) static unsigned int exynos_dp_read_edid(struct exynos_dp *regs)
{ {
unsigned char edid[EDID_BLOCK_LENGTH * 2]; unsigned char edid[EDID_BLOCK_LENGTH * 2];
unsigned int extend_block = 0; unsigned int extend_block = 0;
@ -77,14 +77,14 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
*/ */
/* Read Extension Flag, Number of 128-byte EDID extension blocks */ /* Read Extension Flag, Number of 128-byte EDID extension blocks */
exynos_dp_read_byte_from_i2c(dp_regs, I2C_EDID_DEVICE_ADDR, exynos_dp_read_byte_from_i2c(regs, I2C_EDID_DEVICE_ADDR,
EDID_EXTENSION_FLAG, &extend_block); EDID_EXTENSION_FLAG, &extend_block);
if (extend_block > 0) { if (extend_block > 0) {
printf("DP EDID data includes a single extension!\n"); printf("DP EDID data includes a single extension!\n");
/* Read EDID data */ /* Read EDID data */
retval = exynos_dp_read_bytes_from_i2c(dp_regs, retval = exynos_dp_read_bytes_from_i2c(regs,
I2C_EDID_DEVICE_ADDR, I2C_EDID_DEVICE_ADDR,
EDID_HEADER_PATTERN, EDID_HEADER_PATTERN,
EDID_BLOCK_LENGTH, EDID_BLOCK_LENGTH,
@ -100,7 +100,7 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
} }
/* Read additional EDID data */ /* Read additional EDID data */
retval = exynos_dp_read_bytes_from_i2c(dp_regs, retval = exynos_dp_read_bytes_from_i2c(regs,
I2C_EDID_DEVICE_ADDR, I2C_EDID_DEVICE_ADDR,
EDID_BLOCK_LENGTH, EDID_BLOCK_LENGTH,
EDID_BLOCK_LENGTH, EDID_BLOCK_LENGTH,
@ -115,13 +115,13 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
return -1; return -1;
} }
exynos_dp_read_byte_from_dpcd(dp_regs, DPCD_TEST_REQUEST, exynos_dp_read_byte_from_dpcd(regs, DPCD_TEST_REQUEST,
&test_vector); &test_vector);
if (test_vector & DPCD_TEST_EDID_READ) { if (test_vector & DPCD_TEST_EDID_READ) {
exynos_dp_write_byte_to_dpcd(dp_regs, exynos_dp_write_byte_to_dpcd(regs,
DPCD_TEST_EDID_CHECKSUM, DPCD_TEST_EDID_CHECKSUM,
edid[EDID_BLOCK_LENGTH + EDID_CHECKSUM]); edid[EDID_BLOCK_LENGTH + EDID_CHECKSUM]);
exynos_dp_write_byte_to_dpcd(dp_regs, exynos_dp_write_byte_to_dpcd(regs,
DPCD_TEST_RESPONSE, DPCD_TEST_RESPONSE,
DPCD_TEST_EDID_CHECKSUM_WRITE); DPCD_TEST_EDID_CHECKSUM_WRITE);
} }
@ -129,7 +129,7 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
debug("DP EDID data does not include any extensions.\n"); debug("DP EDID data does not include any extensions.\n");
/* Read EDID data */ /* Read EDID data */
retval = exynos_dp_read_bytes_from_i2c(dp_regs, retval = exynos_dp_read_bytes_from_i2c(regs,
I2C_EDID_DEVICE_ADDR, I2C_EDID_DEVICE_ADDR,
EDID_HEADER_PATTERN, EDID_HEADER_PATTERN,
EDID_BLOCK_LENGTH, EDID_BLOCK_LENGTH,
@ -145,12 +145,12 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
return -1; return -1;
} }
exynos_dp_read_byte_from_dpcd(dp_regs, DPCD_TEST_REQUEST, exynos_dp_read_byte_from_dpcd(regs, DPCD_TEST_REQUEST,
&test_vector); &test_vector);
if (test_vector & DPCD_TEST_EDID_READ) { if (test_vector & DPCD_TEST_EDID_READ) {
exynos_dp_write_byte_to_dpcd(dp_regs, exynos_dp_write_byte_to_dpcd(regs,
DPCD_TEST_EDID_CHECKSUM, edid[EDID_CHECKSUM]); DPCD_TEST_EDID_CHECKSUM, edid[EDID_CHECKSUM]);
exynos_dp_write_byte_to_dpcd(dp_regs, exynos_dp_write_byte_to_dpcd(regs,
DPCD_TEST_RESPONSE, DPCD_TEST_RESPONSE,
DPCD_TEST_EDID_CHECKSUM_WRITE); DPCD_TEST_EDID_CHECKSUM_WRITE);
} }
@ -161,8 +161,8 @@ static unsigned int exynos_dp_read_edid(struct exynos_dp *dp_regs)
return 0; return 0;
} }
static unsigned int exynos_dp_handle_edid(struct exynos_dp *dp_regs, static unsigned int exynos_dp_handle_edid(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned char buf[12]; unsigned char buf[12];
unsigned int ret; unsigned int ret;
@ -180,7 +180,7 @@ static unsigned int exynos_dp_handle_edid(struct exynos_dp *dp_regs,
retry_cnt = 5; retry_cnt = 5;
while (retry_cnt) { while (retry_cnt) {
/* Read DPCD 0x0000-0x000b */ /* Read DPCD 0x0000-0x000b */
ret = exynos_dp_read_bytes_from_dpcd(dp_regs, DPCD_DPCD_REV, 12, ret = exynos_dp_read_bytes_from_dpcd(regs, DPCD_DPCD_REV, 12,
buf); buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
if (retry_cnt == 0) { if (retry_cnt == 0) {
@ -195,7 +195,7 @@ static unsigned int exynos_dp_handle_edid(struct exynos_dp *dp_regs,
/* */ /* */
temp = buf[DPCD_DPCD_REV]; temp = buf[DPCD_DPCD_REV];
if (temp == DP_DPCD_REV_10 || temp == DP_DPCD_REV_11) if (temp == DP_DPCD_REV_10 || temp == DP_DPCD_REV_11)
edp_info->dpcd_rev = temp; priv->dpcd_rev = temp;
else { else {
printf("DP Wrong DPCD Rev : %x\n", temp); printf("DP Wrong DPCD Rev : %x\n", temp);
return -ENODEV; return -ENODEV;
@ -203,33 +203,33 @@ static unsigned int exynos_dp_handle_edid(struct exynos_dp *dp_regs,
temp = buf[DPCD_MAX_LINK_RATE]; temp = buf[DPCD_MAX_LINK_RATE];
if (temp == DP_LANE_BW_1_62 || temp == DP_LANE_BW_2_70) if (temp == DP_LANE_BW_1_62 || temp == DP_LANE_BW_2_70)
edp_info->lane_bw = temp; priv->lane_bw = temp;
else { else {
printf("DP Wrong MAX LINK RATE : %x\n", temp); printf("DP Wrong MAX LINK RATE : %x\n", temp);
return -EINVAL; return -EINVAL;
} }
/* Refer VESA Display Port Standard Ver1.1a Page 120 */ /* Refer VESA Display Port Standard Ver1.1a Page 120 */
if (edp_info->dpcd_rev == DP_DPCD_REV_11) { if (priv->dpcd_rev == DP_DPCD_REV_11) {
temp = buf[DPCD_MAX_LANE_COUNT] & 0x1f; temp = buf[DPCD_MAX_LANE_COUNT] & 0x1f;
if (buf[DPCD_MAX_LANE_COUNT] & 0x80) if (buf[DPCD_MAX_LANE_COUNT] & 0x80)
edp_info->dpcd_efc = 1; priv->dpcd_efc = 1;
else else
edp_info->dpcd_efc = 0; priv->dpcd_efc = 0;
} else { } else {
temp = buf[DPCD_MAX_LANE_COUNT]; temp = buf[DPCD_MAX_LANE_COUNT];
edp_info->dpcd_efc = 0; priv->dpcd_efc = 0;
} }
if (temp == DP_LANE_CNT_1 || temp == DP_LANE_CNT_2 || if (temp == DP_LANE_CNT_1 || temp == DP_LANE_CNT_2 ||
temp == DP_LANE_CNT_4) { temp == DP_LANE_CNT_4) {
edp_info->lane_cnt = temp; priv->lane_cnt = temp;
} else { } else {
printf("DP Wrong MAX LANE COUNT : %x\n", temp); printf("DP Wrong MAX LANE COUNT : %x\n", temp);
return -EINVAL; return -EINVAL;
} }
ret = exynos_dp_read_edid(dp_regs); ret = exynos_dp_read_edid(regs);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP exynos_dp_read_edid() failed\n"); printf("DP exynos_dp_read_edid() failed\n");
return -EINVAL; return -EINVAL;
@ -238,35 +238,35 @@ static unsigned int exynos_dp_handle_edid(struct exynos_dp *dp_regs,
return ret; return ret;
} }
static void exynos_dp_init_training(struct exynos_dp *dp_regs) static void exynos_dp_init_training(struct exynos_dp *regs)
{ {
/* /*
* MACRO_RST must be applied after the PLL_LOCK to avoid * MACRO_RST must be applied after the PLL_LOCK to avoid
* the DP inter pair skew issue for at least 10 us * the DP inter pair skew issue for at least 10 us
*/ */
exynos_dp_reset_macro(dp_regs); exynos_dp_reset_macro(regs);
/* All DP analog module power up */ /* All DP analog module power up */
exynos_dp_set_analog_power_down(dp_regs, POWER_ALL, 0); exynos_dp_set_analog_power_down(regs, POWER_ALL, 0);
} }
static unsigned int exynos_dp_link_start(struct exynos_dp *dp_regs, static unsigned int exynos_dp_link_start(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned char buf[5]; unsigned char buf[5];
unsigned int ret = 0; unsigned int ret = 0;
debug("DP: %s was called\n", __func__); debug("DP: %s was called\n", __func__);
edp_info->lt_info.lt_status = DP_LT_CR; priv->lt_info.lt_status = DP_LT_CR;
edp_info->lt_info.ep_loop = 0; priv->lt_info.ep_loop = 0;
edp_info->lt_info.cr_loop[0] = 0; priv->lt_info.cr_loop[0] = 0;
edp_info->lt_info.cr_loop[1] = 0; priv->lt_info.cr_loop[1] = 0;
edp_info->lt_info.cr_loop[2] = 0; priv->lt_info.cr_loop[2] = 0;
edp_info->lt_info.cr_loop[3] = 0; priv->lt_info.cr_loop[3] = 0;
/* Set sink to D0 (Sink Not Ready) mode. */ /* Set sink to D0 (Sink Not Ready) mode. */
ret = exynos_dp_write_byte_to_dpcd(dp_regs, DPCD_SINK_POWER_STATE, ret = exynos_dp_write_byte_to_dpcd(regs, DPCD_SINK_POWER_STATE,
DPCD_SET_POWER_STATE_D0); DPCD_SET_POWER_STATE_D0);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write_dpcd_byte failed\n"); printf("DP write_dpcd_byte failed\n");
@ -274,24 +274,24 @@ static unsigned int exynos_dp_link_start(struct exynos_dp *dp_regs,
} }
/* Set link rate and count as you want to establish */ /* Set link rate and count as you want to establish */
exynos_dp_set_link_bandwidth(dp_regs, edp_info->lane_bw); exynos_dp_set_link_bandwidth(regs, priv->lane_bw);
exynos_dp_set_lane_count(dp_regs, edp_info->lane_cnt); exynos_dp_set_lane_count(regs, priv->lane_cnt);
/* Setup RX configuration */ /* Setup RX configuration */
buf[0] = edp_info->lane_bw; buf[0] = priv->lane_bw;
buf[1] = edp_info->lane_cnt; buf[1] = priv->lane_cnt;
ret = exynos_dp_write_bytes_to_dpcd(dp_regs, DPCD_LINK_BW_SET, 2, buf); ret = exynos_dp_write_bytes_to_dpcd(regs, DPCD_LINK_BW_SET, 2, buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write_dpcd_byte failed\n"); printf("DP write_dpcd_byte failed\n");
return ret; return ret;
} }
exynos_dp_set_lane_pre_emphasis(dp_regs, PRE_EMPHASIS_LEVEL_0, exynos_dp_set_lane_pre_emphasis(regs, PRE_EMPHASIS_LEVEL_0,
edp_info->lane_cnt); priv->lane_cnt);
/* Set training pattern 1 */ /* Set training pattern 1 */
exynos_dp_set_training_pattern(dp_regs, TRAINING_PTN1); exynos_dp_set_training_pattern(regs, TRAINING_PTN1);
/* Set RX training pattern */ /* Set RX training pattern */
buf[0] = DPCD_SCRAMBLING_DISABLED | DPCD_TRAINING_PATTERN_1; buf[0] = DPCD_SCRAMBLING_DISABLED | DPCD_TRAINING_PATTERN_1;
@ -305,7 +305,7 @@ static unsigned int exynos_dp_link_start(struct exynos_dp *dp_regs,
buf[4] = DPCD_PRE_EMPHASIS_SET_PATTERN_2_LEVEL_0 | buf[4] = DPCD_PRE_EMPHASIS_SET_PATTERN_2_LEVEL_0 |
DPCD_VOLTAGE_SWING_SET_PATTERN_1_LEVEL_0; DPCD_VOLTAGE_SWING_SET_PATTERN_1_LEVEL_0;
ret = exynos_dp_write_bytes_to_dpcd(dp_regs, DPCD_TRAINING_PATTERN_SET, ret = exynos_dp_write_bytes_to_dpcd(regs, DPCD_TRAINING_PATTERN_SET,
5, buf); 5, buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write_dpcd_byte failed\n"); printf("DP write_dpcd_byte failed\n");
@ -315,13 +315,13 @@ static unsigned int exynos_dp_link_start(struct exynos_dp *dp_regs,
return ret; return ret;
} }
static unsigned int exynos_dp_training_pattern_dis(struct exynos_dp *dp_regs) static unsigned int exynos_dp_training_pattern_dis(struct exynos_dp *regs)
{ {
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
exynos_dp_set_training_pattern(dp_regs, DP_NONE); exynos_dp_set_training_pattern(regs, DP_NONE);
ret = exynos_dp_write_byte_to_dpcd(dp_regs, DPCD_TRAINING_PATTERN_SET, ret = exynos_dp_write_byte_to_dpcd(regs, DPCD_TRAINING_PATTERN_SET,
DPCD_TRAINING_PATTERN_DISABLED); DPCD_TRAINING_PATTERN_DISABLED);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP request_link_training_req failed\n"); printf("DP request_link_training_req failed\n");
@ -332,12 +332,12 @@ static unsigned int exynos_dp_training_pattern_dis(struct exynos_dp *dp_regs)
} }
static unsigned int exynos_dp_enable_rx_to_enhanced_mode( static unsigned int exynos_dp_enable_rx_to_enhanced_mode(
struct exynos_dp *dp_regs, unsigned char enable) struct exynos_dp *regs, unsigned char enable)
{ {
unsigned char data; unsigned char data;
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
ret = exynos_dp_read_byte_from_dpcd(dp_regs, DPCD_LANE_COUNT_SET, ret = exynos_dp_read_byte_from_dpcd(regs, DPCD_LANE_COUNT_SET,
&data); &data);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read_from_dpcd failed\n"); printf("DP read_from_dpcd failed\n");
@ -349,7 +349,7 @@ static unsigned int exynos_dp_enable_rx_to_enhanced_mode(
else else
data = DPCD_LN_COUNT_SET(data); data = DPCD_LN_COUNT_SET(data);
ret = exynos_dp_write_byte_to_dpcd(dp_regs, DPCD_LANE_COUNT_SET, data); ret = exynos_dp_write_byte_to_dpcd(regs, DPCD_LANE_COUNT_SET, data);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write_to_dpcd failed\n"); printf("DP write_to_dpcd failed\n");
return -EAGAIN; return -EAGAIN;
@ -359,24 +359,24 @@ static unsigned int exynos_dp_enable_rx_to_enhanced_mode(
return ret; return ret;
} }
static unsigned int exynos_dp_set_enhanced_mode(struct exynos_dp *dp_regs, static unsigned int exynos_dp_set_enhanced_mode(struct exynos_dp *regs,
unsigned char enhance_mode) unsigned char enhance_mode)
{ {
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
ret = exynos_dp_enable_rx_to_enhanced_mode(dp_regs, enhance_mode); ret = exynos_dp_enable_rx_to_enhanced_mode(regs, enhance_mode);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP rx_enhance_mode failed\n"); printf("DP rx_enhance_mode failed\n");
return -EAGAIN; return -EAGAIN;
} }
exynos_dp_enable_enhanced_mode(dp_regs, enhance_mode); exynos_dp_enable_enhanced_mode(regs, enhance_mode);
return ret; return ret;
} }
static int exynos_dp_read_dpcd_lane_stat(struct exynos_dp *dp_regs, static int exynos_dp_read_dpcd_lane_stat(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info, struct exynos_dp_priv *priv,
unsigned char *status) unsigned char *status)
{ {
unsigned int ret, i; unsigned int ret, i;
@ -389,14 +389,14 @@ static int exynos_dp_read_dpcd_lane_stat(struct exynos_dp *dp_regs,
shift_val[2] = 0; shift_val[2] = 0;
shift_val[3] = 4; shift_val[3] = 4;
ret = exynos_dp_read_bytes_from_dpcd(dp_regs, DPCD_LANE0_1_STATUS, 2, ret = exynos_dp_read_bytes_from_dpcd(regs, DPCD_LANE0_1_STATUS, 2,
buf); buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read lane status failed\n"); printf("DP read lane status failed\n");
return ret; return ret;
} }
for (i = 0; i < edp_info->lane_cnt; i++) { for (i = 0; i < priv->lane_cnt; i++) {
lane_stat[i] = (buf[(i / 2)] >> shift_val[i]) & 0x0f; lane_stat[i] = (buf[(i / 2)] >> shift_val[i]) & 0x0f;
if (lane_stat[0] != lane_stat[i]) { if (lane_stat[0] != lane_stat[i]) {
printf("Wrong lane status\n"); printf("Wrong lane status\n");
@ -409,7 +409,7 @@ static int exynos_dp_read_dpcd_lane_stat(struct exynos_dp *dp_regs,
return ret; return ret;
} }
static unsigned int exynos_dp_read_dpcd_adj_req(struct exynos_dp *dp_regs, static unsigned int exynos_dp_read_dpcd_adj_req(struct exynos_dp *regs,
unsigned char lane_num, unsigned char *sw, unsigned char *em) unsigned char lane_num, unsigned char *sw, unsigned char *em)
{ {
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
@ -420,7 +420,7 @@ static unsigned int exynos_dp_read_dpcd_adj_req(struct exynos_dp *dp_regs,
/* lane_num value is used as array index, so this range 0 ~ 3 */ /* lane_num value is used as array index, so this range 0 ~ 3 */
dpcd_addr = DPCD_ADJUST_REQUEST_LANE0_1 + (lane_num / 2); dpcd_addr = DPCD_ADJUST_REQUEST_LANE0_1 + (lane_num / 2);
ret = exynos_dp_read_byte_from_dpcd(dp_regs, dpcd_addr, &buf); ret = exynos_dp_read_byte_from_dpcd(regs, dpcd_addr, &buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read adjust request failed\n"); printf("DP read adjust request failed\n");
return -EAGAIN; return -EAGAIN;
@ -432,53 +432,53 @@ static unsigned int exynos_dp_read_dpcd_adj_req(struct exynos_dp *dp_regs,
return ret; return ret;
} }
static int exynos_dp_equalizer_err_link(struct exynos_dp *dp_regs, static int exynos_dp_equalizer_err_link(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
int ret; int ret;
ret = exynos_dp_training_pattern_dis(dp_regs); ret = exynos_dp_training_pattern_dis(regs);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP training_pattern_disable() failed\n"); printf("DP training_pattern_disable() failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
} }
ret = exynos_dp_set_enhanced_mode(dp_regs, edp_info->dpcd_efc); ret = exynos_dp_set_enhanced_mode(regs, priv->dpcd_efc);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP set_enhanced_mode() failed\n"); printf("DP set_enhanced_mode() failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
} }
return ret; return ret;
} }
static int exynos_dp_reduce_link_rate(struct exynos_dp *dp_regs, static int exynos_dp_reduce_link_rate(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
int ret; int ret;
if (edp_info->lane_bw == DP_LANE_BW_2_70) { if (priv->lane_bw == DP_LANE_BW_2_70) {
edp_info->lane_bw = DP_LANE_BW_1_62; priv->lane_bw = DP_LANE_BW_1_62;
printf("DP Change lane bw to 1.62Gbps\n"); printf("DP Change lane bw to 1.62Gbps\n");
edp_info->lt_info.lt_status = DP_LT_START; priv->lt_info.lt_status = DP_LT_START;
ret = EXYNOS_DP_SUCCESS; ret = EXYNOS_DP_SUCCESS;
} else { } else {
ret = exynos_dp_training_pattern_dis(dp_regs); ret = exynos_dp_training_pattern_dis(regs);
if (ret != EXYNOS_DP_SUCCESS) if (ret != EXYNOS_DP_SUCCESS)
printf("DP training_patter_disable() failed\n"); printf("DP training_patter_disable() failed\n");
ret = exynos_dp_set_enhanced_mode(dp_regs, edp_info->dpcd_efc); ret = exynos_dp_set_enhanced_mode(regs, priv->dpcd_efc);
if (ret != EXYNOS_DP_SUCCESS) if (ret != EXYNOS_DP_SUCCESS)
printf("DP set_enhanced_mode() failed\n"); printf("DP set_enhanced_mode() failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
} }
return ret; return ret;
} }
static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs, static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
unsigned char lane_stat; unsigned char lane_stat;
@ -491,22 +491,22 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs,
debug("DP: %s was called\n", __func__); debug("DP: %s was called\n", __func__);
mdelay(1); mdelay(1);
ret = exynos_dp_read_dpcd_lane_stat(dp_regs, edp_info, &lane_stat); ret = exynos_dp_read_dpcd_lane_stat(regs, priv, &lane_stat);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read lane status failed\n"); printf("DP read lane status failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
if (lane_stat & DP_LANE_STAT_CR_DONE) { if (lane_stat & DP_LANE_STAT_CR_DONE) {
debug("DP clock Recovery training succeed\n"); debug("DP clock Recovery training succeed\n");
exynos_dp_set_training_pattern(dp_regs, TRAINING_PTN2); exynos_dp_set_training_pattern(regs, TRAINING_PTN2);
for (i = 0; i < edp_info->lane_cnt; i++) { for (i = 0; i < priv->lane_cnt; i++) {
ret = exynos_dp_read_dpcd_adj_req(dp_regs, i, ret = exynos_dp_read_dpcd_adj_req(regs, i,
&adj_req_sw, &adj_req_em); &adj_req_sw, &adj_req_em);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
@ -518,7 +518,7 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs,
lt_ctl_val[i] |= MAX_DRIVE_CURRENT_REACH_3 | lt_ctl_val[i] |= MAX_DRIVE_CURRENT_REACH_3 |
MAX_PRE_EMPHASIS_REACH_3; MAX_PRE_EMPHASIS_REACH_3;
} }
exynos_dp_set_lanex_pre_emphasis(dp_regs, exynos_dp_set_lanex_pre_emphasis(regs,
lt_ctl_val[i], i); lt_ctl_val[i], i);
} }
@ -528,39 +528,39 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs,
buf[3] = lt_ctl_val[2]; buf[3] = lt_ctl_val[2];
buf[4] = lt_ctl_val[3]; buf[4] = lt_ctl_val[3];
ret = exynos_dp_write_bytes_to_dpcd(dp_regs, ret = exynos_dp_write_bytes_to_dpcd(regs,
DPCD_TRAINING_PATTERN_SET, 5, buf); DPCD_TRAINING_PATTERN_SET, 5, buf);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write training pattern1 failed\n"); printf("DP write training pattern1 failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} else } else
edp_info->lt_info.lt_status = DP_LT_ET; priv->lt_info.lt_status = DP_LT_ET;
} else { } else {
for (i = 0; i < edp_info->lane_cnt; i++) { for (i = 0; i < priv->lane_cnt; i++) {
lt_ctl_val[i] = exynos_dp_get_lanex_pre_emphasis( lt_ctl_val[i] = exynos_dp_get_lanex_pre_emphasis(
dp_regs, i); regs, i);
ret = exynos_dp_read_dpcd_adj_req(dp_regs, i, ret = exynos_dp_read_dpcd_adj_req(regs, i,
&adj_req_sw, &adj_req_em); &adj_req_sw, &adj_req_em);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read adj req failed\n"); printf("DP read adj req failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
if ((adj_req_sw == VOLTAGE_LEVEL_3) || if ((adj_req_sw == VOLTAGE_LEVEL_3) ||
(adj_req_em == PRE_EMPHASIS_LEVEL_3)) (adj_req_em == PRE_EMPHASIS_LEVEL_3))
ret = exynos_dp_reduce_link_rate(dp_regs, ret = exynos_dp_reduce_link_rate(regs,
edp_info); priv);
if ((DRIVE_CURRENT_SET_0_GET(lt_ctl_val[i]) == if ((DRIVE_CURRENT_SET_0_GET(lt_ctl_val[i]) ==
adj_req_sw) && adj_req_sw) &&
(PRE_EMPHASIS_SET_0_GET(lt_ctl_val[i]) == (PRE_EMPHASIS_SET_0_GET(lt_ctl_val[i]) ==
adj_req_em)) { adj_req_em)) {
edp_info->lt_info.cr_loop[i]++; priv->lt_info.cr_loop[i]++;
if (edp_info->lt_info.cr_loop[i] == MAX_CR_LOOP) if (priv->lt_info.cr_loop[i] == MAX_CR_LOOP)
ret = exynos_dp_reduce_link_rate( ret = exynos_dp_reduce_link_rate(
dp_regs, edp_info); regs, priv);
} }
lt_ctl_val[i] = 0; lt_ctl_val[i] = 0;
@ -571,15 +571,15 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs,
lt_ctl_val[i] |= MAX_DRIVE_CURRENT_REACH_3 | lt_ctl_val[i] |= MAX_DRIVE_CURRENT_REACH_3 |
MAX_PRE_EMPHASIS_REACH_3; MAX_PRE_EMPHASIS_REACH_3;
} }
exynos_dp_set_lanex_pre_emphasis(dp_regs, exynos_dp_set_lanex_pre_emphasis(regs,
lt_ctl_val[i], i); lt_ctl_val[i], i);
} }
ret = exynos_dp_write_bytes_to_dpcd(dp_regs, ret = exynos_dp_write_bytes_to_dpcd(regs,
DPCD_TRAINING_LANE0_SET, 4, lt_ctl_val); DPCD_TRAINING_LANE0_SET, 4, lt_ctl_val);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP write training pattern2 failed\n"); printf("DP write training pattern2 failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
} }
@ -588,7 +588,7 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *dp_regs,
} }
static unsigned int exynos_dp_process_equalizer_training( static unsigned int exynos_dp_process_equalizer_training(
struct exynos_dp *dp_regs, struct exynos_dp_priv *edp_info) struct exynos_dp *regs, struct exynos_dp_priv *priv)
{ {
unsigned int ret = EXYNOS_DP_SUCCESS; unsigned int ret = EXYNOS_DP_SUCCESS;
unsigned char lane_stat, adj_req_sw, adj_req_em, i; unsigned char lane_stat, adj_req_sw, adj_req_em, i;
@ -600,33 +600,33 @@ static unsigned int exynos_dp_process_equalizer_training(
mdelay(1); mdelay(1);
ret = exynos_dp_read_dpcd_lane_stat(dp_regs, edp_info, &lane_stat); ret = exynos_dp_read_dpcd_lane_stat(regs, priv, &lane_stat);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read lane status failed\n"); printf("DP read lane status failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
debug("DP lane stat : %x\n", lane_stat); debug("DP lane stat : %x\n", lane_stat);
if (lane_stat & DP_LANE_STAT_CR_DONE) { if (lane_stat & DP_LANE_STAT_CR_DONE) {
ret = exynos_dp_read_byte_from_dpcd(dp_regs, ret = exynos_dp_read_byte_from_dpcd(regs,
DPCD_LN_ALIGN_UPDATED, DPCD_LN_ALIGN_UPDATED,
&sink_stat); &sink_stat);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
interlane_aligned = (sink_stat & DPCD_INTERLANE_ALIGN_DONE); interlane_aligned = (sink_stat & DPCD_INTERLANE_ALIGN_DONE);
for (i = 0; i < edp_info->lane_cnt; i++) { for (i = 0; i < priv->lane_cnt; i++) {
ret = exynos_dp_read_dpcd_adj_req(dp_regs, i, ret = exynos_dp_read_dpcd_adj_req(regs, i,
&adj_req_sw, &adj_req_em); &adj_req_sw, &adj_req_em);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP read adj req 1 failed\n"); printf("DP read adj req 1 failed\n");
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
return ret; return ret;
} }
@ -646,91 +646,91 @@ static unsigned int exynos_dp_process_equalizer_training(
&& (interlane_aligned == DPCD_INTERLANE_ALIGN_DONE)) { && (interlane_aligned == DPCD_INTERLANE_ALIGN_DONE)) {
debug("DP Equalizer training succeed\n"); debug("DP Equalizer training succeed\n");
f_bw = exynos_dp_get_link_bandwidth(dp_regs); f_bw = exynos_dp_get_link_bandwidth(regs);
f_lane_cnt = exynos_dp_get_lane_count(dp_regs); f_lane_cnt = exynos_dp_get_lane_count(regs);
debug("DP final BandWidth : %x\n", f_bw); debug("DP final BandWidth : %x\n", f_bw);
debug("DP final Lane Count : %x\n", f_lane_cnt); debug("DP final Lane Count : %x\n", f_lane_cnt);
edp_info->lt_info.lt_status = DP_LT_FINISHED; priv->lt_info.lt_status = DP_LT_FINISHED;
exynos_dp_equalizer_err_link(dp_regs, edp_info); exynos_dp_equalizer_err_link(regs, priv);
} else { } else {
edp_info->lt_info.ep_loop++; priv->lt_info.ep_loop++;
if (edp_info->lt_info.ep_loop > MAX_EQ_LOOP) { if (priv->lt_info.ep_loop > MAX_EQ_LOOP) {
if (edp_info->lane_bw == DP_LANE_BW_2_70) { if (priv->lane_bw == DP_LANE_BW_2_70) {
ret = exynos_dp_reduce_link_rate( ret = exynos_dp_reduce_link_rate(
dp_regs, edp_info); regs, priv);
} else { } else {
edp_info->lt_info.lt_status = priv->lt_info.lt_status =
DP_LT_FAIL; DP_LT_FAIL;
exynos_dp_equalizer_err_link(dp_regs, exynos_dp_equalizer_err_link(regs,
edp_info); priv);
} }
} else { } else {
for (i = 0; i < edp_info->lane_cnt; i++) for (i = 0; i < priv->lane_cnt; i++)
exynos_dp_set_lanex_pre_emphasis( exynos_dp_set_lanex_pre_emphasis(
dp_regs, lt_ctl_val[i], i); regs, lt_ctl_val[i], i);
ret = exynos_dp_write_bytes_to_dpcd(dp_regs, ret = exynos_dp_write_bytes_to_dpcd(regs,
DPCD_TRAINING_LANE0_SET, DPCD_TRAINING_LANE0_SET,
4, lt_ctl_val); 4, lt_ctl_val);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP set lt pattern failed\n"); printf("DP set lt pattern failed\n");
edp_info->lt_info.lt_status = priv->lt_info.lt_status =
DP_LT_FAIL; DP_LT_FAIL;
exynos_dp_equalizer_err_link(dp_regs, exynos_dp_equalizer_err_link(regs,
edp_info); priv);
} }
} }
} }
} else if (edp_info->lane_bw == DP_LANE_BW_2_70) { } else if (priv->lane_bw == DP_LANE_BW_2_70) {
ret = exynos_dp_reduce_link_rate(dp_regs, edp_info); ret = exynos_dp_reduce_link_rate(regs, priv);
} else { } else {
edp_info->lt_info.lt_status = DP_LT_FAIL; priv->lt_info.lt_status = DP_LT_FAIL;
exynos_dp_equalizer_err_link(dp_regs, edp_info); exynos_dp_equalizer_err_link(regs, priv);
} }
return ret; return ret;
} }
static unsigned int exynos_dp_sw_link_training(struct exynos_dp *dp_regs, static unsigned int exynos_dp_sw_link_training(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned int ret = 0; unsigned int ret = 0;
int training_finished; int training_finished;
/* Turn off unnecessary lane */ /* Turn off unnecessary lane */
if (edp_info->lane_cnt == 1) if (priv->lane_cnt == 1)
exynos_dp_set_analog_power_down(dp_regs, CH1_BLOCK, 1); exynos_dp_set_analog_power_down(regs, CH1_BLOCK, 1);
training_finished = 0; training_finished = 0;
edp_info->lt_info.lt_status = DP_LT_START; priv->lt_info.lt_status = DP_LT_START;
/* Process here */ /* Process here */
while (!training_finished) { while (!training_finished) {
switch (edp_info->lt_info.lt_status) { switch (priv->lt_info.lt_status) {
case DP_LT_START: case DP_LT_START:
ret = exynos_dp_link_start(dp_regs, edp_info); ret = exynos_dp_link_start(regs, priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP LT:link start failed\n"); printf("DP LT:link start failed\n");
return ret; return ret;
} }
break; break;
case DP_LT_CR: case DP_LT_CR:
ret = exynos_dp_process_clock_recovery(dp_regs, ret = exynos_dp_process_clock_recovery(regs,
edp_info); priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP LT:clock recovery failed\n"); printf("DP LT:clock recovery failed\n");
return ret; return ret;
} }
break; break;
case DP_LT_ET: case DP_LT_ET:
ret = exynos_dp_process_equalizer_training(dp_regs, ret = exynos_dp_process_equalizer_training(regs,
edp_info); priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP LT:equalizer training failed\n"); printf("DP LT:equalizer training failed\n");
return ret; return ret;
@ -747,75 +747,75 @@ static unsigned int exynos_dp_sw_link_training(struct exynos_dp *dp_regs,
return ret; return ret;
} }
static unsigned int exynos_dp_set_link_train(struct exynos_dp *dp_regs, static unsigned int exynos_dp_set_link_train(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned int ret; unsigned int ret;
exynos_dp_init_training(dp_regs); exynos_dp_init_training(regs);
ret = exynos_dp_sw_link_training(dp_regs, edp_info); ret = exynos_dp_sw_link_training(regs, priv);
if (ret != EXYNOS_DP_SUCCESS) if (ret != EXYNOS_DP_SUCCESS)
printf("DP dp_sw_link_training() failed\n"); printf("DP dp_sw_link_training() failed\n");
return ret; return ret;
} }
static void exynos_dp_enable_scramble(struct exynos_dp *dp_regs, static void exynos_dp_enable_scramble(struct exynos_dp *regs,
unsigned int enable) unsigned int enable)
{ {
unsigned char data; unsigned char data;
if (enable) { if (enable) {
exynos_dp_enable_scrambling(dp_regs, DP_ENABLE); exynos_dp_enable_scrambling(regs, DP_ENABLE);
exynos_dp_read_byte_from_dpcd(dp_regs, exynos_dp_read_byte_from_dpcd(regs,
DPCD_TRAINING_PATTERN_SET, &data); DPCD_TRAINING_PATTERN_SET, &data);
exynos_dp_write_byte_to_dpcd(dp_regs, DPCD_TRAINING_PATTERN_SET, exynos_dp_write_byte_to_dpcd(regs, DPCD_TRAINING_PATTERN_SET,
(u8)(data & ~DPCD_SCRAMBLING_DISABLED)); (u8)(data & ~DPCD_SCRAMBLING_DISABLED));
} else { } else {
exynos_dp_enable_scrambling(dp_regs, DP_DISABLE); exynos_dp_enable_scrambling(regs, DP_DISABLE);
exynos_dp_read_byte_from_dpcd(dp_regs, exynos_dp_read_byte_from_dpcd(regs,
DPCD_TRAINING_PATTERN_SET, &data); DPCD_TRAINING_PATTERN_SET, &data);
exynos_dp_write_byte_to_dpcd(dp_regs, DPCD_TRAINING_PATTERN_SET, exynos_dp_write_byte_to_dpcd(regs, DPCD_TRAINING_PATTERN_SET,
(u8)(data | DPCD_SCRAMBLING_DISABLED)); (u8)(data | DPCD_SCRAMBLING_DISABLED));
} }
} }
static unsigned int exynos_dp_config_video(struct exynos_dp *dp_regs, static unsigned int exynos_dp_config_video(struct exynos_dp *regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned int ret = 0; unsigned int ret = 0;
unsigned int retry_cnt; unsigned int retry_cnt;
mdelay(1); mdelay(1);
if (edp_info->video_info.master_mode) { if (priv->video_info.master_mode) {
printf("DP does not support master mode\n"); printf("DP does not support master mode\n");
return -ENODEV; return -ENODEV;
} else { } else {
/* debug slave */ /* debug slave */
exynos_dp_config_video_slave_mode(dp_regs, exynos_dp_config_video_slave_mode(regs,
&edp_info->video_info); &priv->video_info);
} }
exynos_dp_set_video_color_format(dp_regs, &edp_info->video_info); exynos_dp_set_video_color_format(regs, &priv->video_info);
if (edp_info->video_info.bist_mode) { if (priv->video_info.bist_mode) {
if (exynos_dp_config_video_bist(dp_regs, edp_info) != 0) if (exynos_dp_config_video_bist(regs, priv) != 0)
return -1; return -1;
} }
ret = exynos_dp_get_pll_lock_status(dp_regs); ret = exynos_dp_get_pll_lock_status(regs);
if (ret != PLL_LOCKED) { if (ret != PLL_LOCKED) {
printf("DP PLL is not locked yet\n"); printf("DP PLL is not locked yet\n");
return -EIO; return -EIO;
} }
if (edp_info->video_info.master_mode == 0) { if (priv->video_info.master_mode == 0) {
retry_cnt = 10; retry_cnt = 10;
while (retry_cnt) { while (retry_cnt) {
ret = exynos_dp_is_slave_video_stream_clock_on(dp_regs); ret = exynos_dp_is_slave_video_stream_clock_on(regs);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
if (retry_cnt == 0) { if (retry_cnt == 0) {
printf("DP stream_clock_on failed\n"); printf("DP stream_clock_on failed\n");
@ -829,34 +829,34 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *dp_regs,
} }
/* Set to use the register calculated M/N video */ /* Set to use the register calculated M/N video */
exynos_dp_set_video_cr_mn(dp_regs, CALCULATED_M, 0, 0); exynos_dp_set_video_cr_mn(regs, CALCULATED_M, 0, 0);
/* For video bist, Video timing must be generated by register */ /* For video bist, Video timing must be generated by register */
exynos_dp_set_video_timing_mode(dp_regs, VIDEO_TIMING_FROM_CAPTURE); exynos_dp_set_video_timing_mode(regs, VIDEO_TIMING_FROM_CAPTURE);
/* Enable video bist */ /* Enable video bist */
if (edp_info->video_info.bist_pattern != COLOR_RAMP && if (priv->video_info.bist_pattern != COLOR_RAMP &&
edp_info->video_info.bist_pattern != BALCK_WHITE_V_LINES && priv->video_info.bist_pattern != BALCK_WHITE_V_LINES &&
edp_info->video_info.bist_pattern != COLOR_SQUARE) priv->video_info.bist_pattern != COLOR_SQUARE)
exynos_dp_enable_video_bist(dp_regs, exynos_dp_enable_video_bist(regs,
edp_info->video_info.bist_mode); priv->video_info.bist_mode);
else else
exynos_dp_enable_video_bist(dp_regs, DP_DISABLE); exynos_dp_enable_video_bist(regs, DP_DISABLE);
/* Disable video mute */ /* Disable video mute */
exynos_dp_enable_video_mute(dp_regs, DP_DISABLE); exynos_dp_enable_video_mute(regs, DP_DISABLE);
/* Configure video Master or Slave mode */ /* Configure video Master or Slave mode */
exynos_dp_enable_video_master(dp_regs, exynos_dp_enable_video_master(regs,
edp_info->video_info.master_mode); priv->video_info.master_mode);
/* Enable video */ /* Enable video */
exynos_dp_start_video(dp_regs); exynos_dp_start_video(regs);
if (edp_info->video_info.master_mode == 0) { if (priv->video_info.master_mode == 0) {
retry_cnt = 100; retry_cnt = 100;
while (retry_cnt) { while (retry_cnt) {
ret = exynos_dp_is_video_stream_on(dp_regs); ret = exynos_dp_is_video_stream_on(regs);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
if (retry_cnt == 0) { if (retry_cnt == 0) {
printf("DP Timeout of video stream\n"); printf("DP Timeout of video stream\n");
@ -872,7 +872,7 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *dp_regs,
return ret; return ret;
} }
int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *edp_info) int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *priv)
{ {
unsigned int node = fdtdec_next_compatible(blob, 0, unsigned int node = fdtdec_next_compatible(blob, 0,
COMPAT_SAMSUNG_EXYNOS5_DP); COMPAT_SAMSUNG_EXYNOS5_DP);
@ -881,47 +881,47 @@ int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *edp_info)
return -ENODEV; return -ENODEV;
} }
edp_info->disp_info.h_res = fdtdec_get_int(blob, node, priv->disp_info.h_res = fdtdec_get_int(blob, node,
"samsung,h-res", 0); "samsung,h-res", 0);
edp_info->disp_info.h_sync_width = fdtdec_get_int(blob, node, priv->disp_info.h_sync_width = fdtdec_get_int(blob, node,
"samsung,h-sync-width", 0); "samsung,h-sync-width", 0);
edp_info->disp_info.h_back_porch = fdtdec_get_int(blob, node, priv->disp_info.h_back_porch = fdtdec_get_int(blob, node,
"samsung,h-back-porch", 0); "samsung,h-back-porch", 0);
edp_info->disp_info.h_front_porch = fdtdec_get_int(blob, node, priv->disp_info.h_front_porch = fdtdec_get_int(blob, node,
"samsung,h-front-porch", 0); "samsung,h-front-porch", 0);
edp_info->disp_info.v_res = fdtdec_get_int(blob, node, priv->disp_info.v_res = fdtdec_get_int(blob, node,
"samsung,v-res", 0); "samsung,v-res", 0);
edp_info->disp_info.v_sync_width = fdtdec_get_int(blob, node, priv->disp_info.v_sync_width = fdtdec_get_int(blob, node,
"samsung,v-sync-width", 0); "samsung,v-sync-width", 0);
edp_info->disp_info.v_back_porch = fdtdec_get_int(blob, node, priv->disp_info.v_back_porch = fdtdec_get_int(blob, node,
"samsung,v-back-porch", 0); "samsung,v-back-porch", 0);
edp_info->disp_info.v_front_porch = fdtdec_get_int(blob, node, priv->disp_info.v_front_porch = fdtdec_get_int(blob, node,
"samsung,v-front-porch", 0); "samsung,v-front-porch", 0);
edp_info->disp_info.v_sync_rate = fdtdec_get_int(blob, node, priv->disp_info.v_sync_rate = fdtdec_get_int(blob, node,
"samsung,v-sync-rate", 0); "samsung,v-sync-rate", 0);
edp_info->lt_info.lt_status = fdtdec_get_int(blob, node, priv->lt_info.lt_status = fdtdec_get_int(blob, node,
"samsung,lt-status", 0); "samsung,lt-status", 0);
edp_info->video_info.master_mode = fdtdec_get_int(blob, node, priv->video_info.master_mode = fdtdec_get_int(blob, node,
"samsung,master-mode", 0); "samsung,master-mode", 0);
edp_info->video_info.bist_mode = fdtdec_get_int(blob, node, priv->video_info.bist_mode = fdtdec_get_int(blob, node,
"samsung,bist-mode", 0); "samsung,bist-mode", 0);
edp_info->video_info.bist_pattern = fdtdec_get_int(blob, node, priv->video_info.bist_pattern = fdtdec_get_int(blob, node,
"samsung,bist-pattern", 0); "samsung,bist-pattern", 0);
edp_info->video_info.h_sync_polarity = fdtdec_get_int(blob, node, priv->video_info.h_sync_polarity = fdtdec_get_int(blob, node,
"samsung,h-sync-polarity", 0); "samsung,h-sync-polarity", 0);
edp_info->video_info.v_sync_polarity = fdtdec_get_int(blob, node, priv->video_info.v_sync_polarity = fdtdec_get_int(blob, node,
"samsung,v-sync-polarity", 0); "samsung,v-sync-polarity", 0);
edp_info->video_info.interlaced = fdtdec_get_int(blob, node, priv->video_info.interlaced = fdtdec_get_int(blob, node,
"samsung,interlaced", 0); "samsung,interlaced", 0);
edp_info->video_info.color_space = fdtdec_get_int(blob, node, priv->video_info.color_space = fdtdec_get_int(blob, node,
"samsung,color-space", 0); "samsung,color-space", 0);
edp_info->video_info.dynamic_range = fdtdec_get_int(blob, node, priv->video_info.dynamic_range = fdtdec_get_int(blob, node,
"samsung,dynamic-range", 0); "samsung,dynamic-range", 0);
edp_info->video_info.ycbcr_coeff = fdtdec_get_int(blob, node, priv->video_info.ycbcr_coeff = fdtdec_get_int(blob, node,
"samsung,ycbcr-coeff", 0); "samsung,ycbcr-coeff", 0);
edp_info->video_info.color_depth = fdtdec_get_int(blob, node, priv->video_info.color_depth = fdtdec_get_int(blob, node,
"samsung,color-depth", 0); "samsung,color-depth", 0);
return 0; return 0;
} }
@ -929,17 +929,17 @@ int exynos_dp_parse_dt(const void *blob, struct exynos_dp_priv *edp_info)
unsigned int exynos_init_dp(void) unsigned int exynos_init_dp(void)
{ {
unsigned int ret; unsigned int ret;
struct exynos_dp_priv *edp_info; struct exynos_dp_priv *priv;
struct exynos_dp *dp_regs; struct exynos_dp *regs;
int node; int node;
edp_info = kzalloc(sizeof(struct exynos_dp_priv), GFP_KERNEL); priv = kzalloc(sizeof(struct exynos_dp_priv), GFP_KERNEL);
if (!edp_info) { if (!priv) {
debug("failed to allocate edp device object.\n"); debug("failed to allocate edp device object.\n");
return -EFAULT; return -EFAULT;
} }
if (exynos_dp_parse_dt(gd->fdt_blob, edp_info)) if (exynos_dp_parse_dt(gd->fdt_blob, priv))
debug("unable to parse DP DT node\n"); debug("unable to parse DP DT node\n");
node = fdtdec_next_compatible(gd->fdt_blob, 0, node = fdtdec_next_compatible(gd->fdt_blob, 0,
@ -947,42 +947,42 @@ unsigned int exynos_init_dp(void)
if (node <= 0) if (node <= 0)
debug("exynos_dp: Can't get device node for dp\n"); debug("exynos_dp: Can't get device node for dp\n");
dp_regs = (struct exynos_dp *)fdtdec_get_addr(gd->fdt_blob, node, regs = (struct exynos_dp *)fdtdec_get_addr(gd->fdt_blob, node,
"reg"); "reg");
if (dp_regs == NULL) if (regs == NULL)
debug("Can't get the DP base address\n"); debug("Can't get the DP base address\n");
exynos_dp_disp_info(&edp_info->disp_info); exynos_dp_disp_info(&priv->disp_info);
exynos_dp_phy_ctrl(1); exynos_dp_phy_ctrl(1);
ret = exynos_dp_init_dp(dp_regs); ret = exynos_dp_init_dp(regs);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP exynos_dp_init_dp() failed\n"); printf("DP exynos_dp_init_dp() failed\n");
return ret; return ret;
} }
ret = exynos_dp_handle_edid(dp_regs, edp_info); ret = exynos_dp_handle_edid(regs, priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("EDP handle_edid fail\n"); printf("EDP handle_edid fail\n");
return ret; return ret;
} }
ret = exynos_dp_set_link_train(dp_regs, edp_info); ret = exynos_dp_set_link_train(regs, priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("DP link training fail\n"); printf("DP link training fail\n");
return ret; return ret;
} }
exynos_dp_enable_scramble(dp_regs, DP_ENABLE); exynos_dp_enable_scramble(regs, DP_ENABLE);
exynos_dp_enable_rx_to_enhanced_mode(dp_regs, DP_ENABLE); exynos_dp_enable_rx_to_enhanced_mode(regs, DP_ENABLE);
exynos_dp_enable_enhanced_mode(dp_regs, DP_ENABLE); exynos_dp_enable_enhanced_mode(regs, DP_ENABLE);
exynos_dp_set_link_bandwidth(dp_regs, edp_info->lane_bw); exynos_dp_set_link_bandwidth(regs, priv->lane_bw);
exynos_dp_set_lane_count(dp_regs, edp_info->lane_cnt); exynos_dp_set_lane_count(regs, priv->lane_cnt);
exynos_dp_init_video(dp_regs); exynos_dp_init_video(regs);
ret = exynos_dp_config_video(dp_regs, edp_info); ret = exynos_dp_config_video(regs, priv);
if (ret != EXYNOS_DP_SUCCESS) { if (ret != EXYNOS_DP_SUCCESS) {
printf("Exynos DP init failed\n"); printf("Exynos DP init failed\n");
return ret; return ret;

69
drivers/video/exynos/exynos_dp_lowlevel.c
View file

@ -1066,49 +1066,46 @@ void exynos_dp_set_video_color_format(struct exynos_dp *dp_regs,
} }
int exynos_dp_config_video_bist(struct exynos_dp *dp_regs, int exynos_dp_config_video_bist(struct exynos_dp *dp_regs,
struct exynos_dp_priv *edp_info) struct exynos_dp_priv *priv)
{ {
unsigned int reg; unsigned int reg;
unsigned int bist_type = 0; unsigned int bist_type = 0;
struct edp_video_info video_info = edp_info->video_info; struct edp_video_info video_info = priv->video_info;
/* For master mode, you don't need to set the video format */ /* For master mode, you don't need to set the video format */
if (video_info.master_mode == 0) { if (video_info.master_mode == 0) {
writel(TOTAL_LINE_CFG_L(edp_info->disp_info.v_total), writel(TOTAL_LINE_CFG_L(priv->disp_info.v_total),
&dp_regs->total_ln_cfg_l); &dp_regs->total_ln_cfg_l);
writel(TOTAL_LINE_CFG_H(edp_info->disp_info.v_total), writel(TOTAL_LINE_CFG_H(priv->disp_info.v_total),
&dp_regs->total_ln_cfg_h); &dp_regs->total_ln_cfg_h);
writel(ACTIVE_LINE_CFG_L(edp_info->disp_info.v_res), writel(ACTIVE_LINE_CFG_L(priv->disp_info.v_res),
&dp_regs->active_ln_cfg_l); &dp_regs->active_ln_cfg_l);
writel(ACTIVE_LINE_CFG_H(edp_info->disp_info.v_res), writel(ACTIVE_LINE_CFG_H(priv->disp_info.v_res),
&dp_regs->active_ln_cfg_h); &dp_regs->active_ln_cfg_h);
writel(edp_info->disp_info.v_sync_width, writel(priv->disp_info.v_sync_width, &dp_regs->vsw_cfg);
&dp_regs->vsw_cfg); writel(priv->disp_info.v_back_porch, &dp_regs->vbp_cfg);
writel(edp_info->disp_info.v_back_porch, writel(priv->disp_info.v_front_porch, &dp_regs->vfp_cfg);
&dp_regs->vbp_cfg);
writel(edp_info->disp_info.v_front_porch,
&dp_regs->vfp_cfg);
writel(TOTAL_PIXEL_CFG_L(edp_info->disp_info.h_total), writel(TOTAL_PIXEL_CFG_L(priv->disp_info.h_total),
&dp_regs->total_pix_cfg_l); &dp_regs->total_pix_cfg_l);
writel(TOTAL_PIXEL_CFG_H(edp_info->disp_info.h_total), writel(TOTAL_PIXEL_CFG_H(priv->disp_info.h_total),
&dp_regs->total_pix_cfg_h); &dp_regs->total_pix_cfg_h);
writel(ACTIVE_PIXEL_CFG_L(edp_info->disp_info.h_res), writel(ACTIVE_PIXEL_CFG_L(priv->disp_info.h_res),
&dp_regs->active_pix_cfg_l); &dp_regs->active_pix_cfg_l);
writel(ACTIVE_PIXEL_CFG_H(edp_info->disp_info.h_res), writel(ACTIVE_PIXEL_CFG_H(priv->disp_info.h_res),
&dp_regs->active_pix_cfg_h); &dp_regs->active_pix_cfg_h);
writel(H_F_PORCH_CFG_L(edp_info->disp_info.h_front_porch), writel(H_F_PORCH_CFG_L(priv->disp_info.h_front_porch),
&dp_regs->hfp_cfg_l); &dp_regs->hfp_cfg_l);
writel(H_F_PORCH_CFG_H(edp_info->disp_info.h_front_porch), writel(H_F_PORCH_CFG_H(priv->disp_info.h_front_porch),
&dp_regs->hfp_cfg_h); &dp_regs->hfp_cfg_h);
writel(H_SYNC_PORCH_CFG_L(edp_info->disp_info.h_sync_width), writel(H_SYNC_PORCH_CFG_L(priv->disp_info.h_sync_width),
&dp_regs->hsw_cfg_l); &dp_regs->hsw_cfg_l);
writel(H_SYNC_PORCH_CFG_H(edp_info->disp_info.h_sync_width), writel(H_SYNC_PORCH_CFG_H(priv->disp_info.h_sync_width),
&dp_regs->hsw_cfg_h); &dp_regs->hsw_cfg_h);
writel(H_B_PORCH_CFG_L(edp_info->disp_info.h_back_porch), writel(H_B_PORCH_CFG_L(priv->disp_info.h_back_porch),
&dp_regs->hbp_cfg_l); &dp_regs->hbp_cfg_l);
writel(H_B_PORCH_CFG_H(edp_info->disp_info.h_back_porch), writel(H_B_PORCH_CFG_H(priv->disp_info.h_back_porch),
&dp_regs->hbp_cfg_h); &dp_regs->hbp_cfg_h);
/* /*
* Set SLAVE_I_SCAN_CFG[2], VSYNC_P_CFG[1], * Set SLAVE_I_SCAN_CFG[2], VSYNC_P_CFG[1],

2
drivers/video/exynos/exynos_dp_lowlevel.h
View file

@ -74,7 +74,7 @@ void exynos_dp_config_video_slave_mode(struct exynos_dp *dp_regs,
void exynos_dp_set_video_color_format(struct exynos_dp *dp_regs, void exynos_dp_set_video_color_format(struct exynos_dp *dp_regs,
struct edp_video_info *video_info); struct edp_video_info *video_info);
int exynos_dp_config_video_bist(struct exynos_dp *dp_regs, int exynos_dp_config_video_bist(struct exynos_dp *dp_regs,
struct exynos_dp_priv *edp_info); struct exynos_dp_priv *priv);
unsigned int exynos_dp_is_slave_video_stream_clock_on( unsigned int exynos_dp_is_slave_video_stream_clock_on(
struct exynos_dp *dp_regs); struct exynos_dp *dp_regs);
void exynos_dp_set_video_cr_mn(struct exynos_dp *dp_regs, unsigned int type, void exynos_dp_set_video_cr_mn(struct exynos_dp *dp_regs, unsigned int type,

234
drivers/video/exynos/exynos_fb.c
View file

@ -35,9 +35,9 @@ struct vidinfo panel_info = {
.vl_col = -1, .vl_col = -1,
}; };
static void exynos_fimd_set_dualrgb(struct vidinfo *pvid, unsigned int enabled) static void exynos_fimd_set_dualrgb(struct vidinfo *priv, unsigned int enabled)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
if (enabled) { if (enabled) {
@ -45,32 +45,32 @@ static void exynos_fimd_set_dualrgb(struct vidinfo *pvid, unsigned int enabled)
EXYNOS_DUALRGB_VDEN_EN_ENABLE; EXYNOS_DUALRGB_VDEN_EN_ENABLE;
/* in case of Line Split mode, MAIN_CNT doesn't neet to set. */ /* in case of Line Split mode, MAIN_CNT doesn't neet to set. */
cfg |= EXYNOS_DUALRGB_SUB_CNT(pvid->vl_col / 2) | cfg |= EXYNOS_DUALRGB_SUB_CNT(priv->vl_col / 2) |
EXYNOS_DUALRGB_MAIN_CNT(0); EXYNOS_DUALRGB_MAIN_CNT(0);
} }
writel(cfg, &fimd_ctrl->dualrgb); writel(cfg, &reg->dualrgb);
} }
static void exynos_fimd_set_dp_clkcon(struct vidinfo *pvid, static void exynos_fimd_set_dp_clkcon(struct vidinfo *priv,
unsigned int enabled) unsigned int enabled)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
if (enabled) if (enabled)
cfg = EXYNOS_DP_CLK_ENABLE; cfg = EXYNOS_DP_CLK_ENABLE;
writel(cfg, &fimd_ctrl->dp_mie_clkcon); writel(cfg, &reg->dp_mie_clkcon);
} }
static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id) static void exynos_fimd_set_par(struct vidinfo *priv, unsigned int win_id)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
/* set window control */ /* set window control */
cfg = readl((unsigned int)&fimd_ctrl->wincon0 + cfg = readl((unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
cfg &= ~(EXYNOS_WINCON_BITSWP_ENABLE | EXYNOS_WINCON_BYTESWP_ENABLE | cfg &= ~(EXYNOS_WINCON_BITSWP_ENABLE | EXYNOS_WINCON_BYTESWP_ENABLE |
@ -86,7 +86,7 @@ static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id)
/* dma burst is 16 */ /* dma burst is 16 */
cfg |= EXYNOS_WINCON_BURSTLEN_16WORD; cfg |= EXYNOS_WINCON_BURSTLEN_16WORD;
switch (pvid->vl_bpix) { switch (priv->vl_bpix) {
case 4: case 4:
cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565; cfg |= EXYNOS_WINCON_BPPMODE_16BPP_565;
break; break;
@ -95,72 +95,72 @@ static void exynos_fimd_set_par(struct vidinfo *pvid, unsigned int win_id)
break; break;
} }
writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + writel(cfg, (unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
/* set window position to x=0, y=0*/ /* set window position to x=0, y=0*/
cfg = EXYNOS_VIDOSD_LEFT_X(0) | EXYNOS_VIDOSD_TOP_Y(0); cfg = EXYNOS_VIDOSD_LEFT_X(0) | EXYNOS_VIDOSD_TOP_Y(0);
writel(cfg, (unsigned int)&fimd_ctrl->vidosd0a + writel(cfg, (unsigned int)&reg->vidosd0a +
EXYNOS_VIDOSD(win_id)); EXYNOS_VIDOSD(win_id));
cfg = EXYNOS_VIDOSD_RIGHT_X(pvid->vl_col - 1) | cfg = EXYNOS_VIDOSD_RIGHT_X(priv->vl_col - 1) |
EXYNOS_VIDOSD_BOTTOM_Y(pvid->vl_row - 1) | EXYNOS_VIDOSD_BOTTOM_Y(priv->vl_row - 1) |
EXYNOS_VIDOSD_RIGHT_X_E(1) | EXYNOS_VIDOSD_RIGHT_X_E(1) |
EXYNOS_VIDOSD_BOTTOM_Y_E(0); EXYNOS_VIDOSD_BOTTOM_Y_E(0);
writel(cfg, (unsigned int)&fimd_ctrl->vidosd0b + writel(cfg, (unsigned int)&reg->vidosd0b +
EXYNOS_VIDOSD(win_id)); EXYNOS_VIDOSD(win_id));
/* set window size for window0*/ /* set window size for window0*/
cfg = EXYNOS_VIDOSD_SIZE(pvid->vl_col * pvid->vl_row); cfg = EXYNOS_VIDOSD_SIZE(priv->vl_col * priv->vl_row);
writel(cfg, (unsigned int)&fimd_ctrl->vidosd0c + writel(cfg, (unsigned int)&reg->vidosd0c +
EXYNOS_VIDOSD(win_id)); EXYNOS_VIDOSD(win_id));
} }
static void exynos_fimd_set_buffer_address(struct vidinfo *pvid, static void exynos_fimd_set_buffer_address(struct vidinfo *priv,
unsigned int win_id, unsigned int win_id,
ulong lcd_base_addr) ulong lcd_base_addr)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned long start_addr, end_addr; unsigned long start_addr, end_addr;
start_addr = lcd_base_addr; start_addr = lcd_base_addr;
end_addr = start_addr + ((pvid->vl_col * (NBITS(pvid->vl_bpix) / 8)) * end_addr = start_addr + ((priv->vl_col * (NBITS(priv->vl_bpix) / 8)) *
pvid->vl_row); priv->vl_row);
writel(start_addr, (unsigned int)&fimd_ctrl->vidw00add0b0 + writel(start_addr, (unsigned int)&reg->vidw00add0b0 +
EXYNOS_BUFFER_OFFSET(win_id)); EXYNOS_BUFFER_OFFSET(win_id));
writel(end_addr, (unsigned int)&fimd_ctrl->vidw00add1b0 + writel(end_addr, (unsigned int)&reg->vidw00add1b0 +
EXYNOS_BUFFER_OFFSET(win_id)); EXYNOS_BUFFER_OFFSET(win_id));
} }
static void exynos_fimd_set_clock(struct vidinfo *pvid) static void exynos_fimd_set_clock(struct vidinfo *priv)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0, div = 0, remainder, remainder_div; unsigned int cfg = 0, div = 0, remainder, remainder_div;
unsigned long pixel_clock; unsigned long pixel_clock;
unsigned long long src_clock; unsigned long long src_clock;
if (pvid->dual_lcd_enabled) { if (priv->dual_lcd_enabled) {
pixel_clock = pvid->vl_freq * pixel_clock = priv->vl_freq *
(pvid->vl_hspw + pvid->vl_hfpd + (priv->vl_hspw + priv->vl_hfpd +
pvid->vl_hbpd + pvid->vl_col / 2) * priv->vl_hbpd + priv->vl_col / 2) *
(pvid->vl_vspw + pvid->vl_vfpd + (priv->vl_vspw + priv->vl_vfpd +
pvid->vl_vbpd + pvid->vl_row); priv->vl_vbpd + priv->vl_row);
} else if (pvid->interface_mode == FIMD_CPU_INTERFACE) { } else if (priv->interface_mode == FIMD_CPU_INTERFACE) {
pixel_clock = pvid->vl_freq * pixel_clock = priv->vl_freq *
pvid->vl_width * pvid->vl_height * priv->vl_width * priv->vl_height *
(pvid->cs_setup + pvid->wr_setup + (priv->cs_setup + priv->wr_setup +
pvid->wr_act + pvid->wr_hold + 1); priv->wr_act + priv->wr_hold + 1);
} else { } else {
pixel_clock = pvid->vl_freq * pixel_clock = priv->vl_freq *
(pvid->vl_hspw + pvid->vl_hfpd + (priv->vl_hspw + priv->vl_hfpd +
pvid->vl_hbpd + pvid->vl_col) * priv->vl_hbpd + priv->vl_col) *
(pvid->vl_vspw + pvid->vl_vfpd + (priv->vl_vspw + priv->vl_vfpd +
pvid->vl_vbpd + pvid->vl_row); priv->vl_vbpd + priv->vl_row);
} }
cfg = readl(&fimd_ctrl->vidcon0); cfg = readl(&reg->vidcon0);
cfg &= ~(EXYNOS_VIDCON0_CLKSEL_MASK | EXYNOS_VIDCON0_CLKVALUP_MASK | cfg &= ~(EXYNOS_VIDCON0_CLKSEL_MASK | EXYNOS_VIDCON0_CLKVALUP_MASK |
EXYNOS_VIDCON0_CLKVAL_F(0xFF) | EXYNOS_VIDCON0_VCLKEN_MASK | EXYNOS_VIDCON0_CLKVAL_F(0xFF) | EXYNOS_VIDCON0_VCLKEN_MASK |
EXYNOS_VIDCON0_CLKDIR_MASK); EXYNOS_VIDCON0_CLKDIR_MASK);
@ -181,32 +181,32 @@ static void exynos_fimd_set_clock(struct vidinfo *pvid)
div++; div++;
/* in case of dual lcd mode. */ /* in case of dual lcd mode. */
if (pvid->dual_lcd_enabled) if (priv->dual_lcd_enabled)
div--; div--;
cfg |= EXYNOS_VIDCON0_CLKVAL_F(div - 1); cfg |= EXYNOS_VIDCON0_CLKVAL_F(div - 1);
writel(cfg, &fimd_ctrl->vidcon0); writel(cfg, &reg->vidcon0);
} }
void exynos_set_trigger(struct vidinfo *pvid) void exynos_set_trigger(struct vidinfo *priv)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
cfg = readl(&fimd_ctrl->trigcon); cfg = readl(&reg->trigcon);
cfg |= (EXYNOS_I80SOFT_TRIG_EN | EXYNOS_I80START_TRIG); cfg |= (EXYNOS_I80SOFT_TRIG_EN | EXYNOS_I80START_TRIG);
writel(cfg, &fimd_ctrl->trigcon); writel(cfg, &reg->trigcon);
} }
int exynos_is_i80_frame_done(struct vidinfo *pvid) int exynos_is_i80_frame_done(struct vidinfo *priv)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
int status; int status;
cfg = readl(&fimd_ctrl->trigcon); cfg = readl(&reg->trigcon);
/* frame done func is valid only when TRIMODE[0] is set to 1. */ /* frame done func is valid only when TRIMODE[0] is set to 1. */
status = (cfg & EXYNOS_I80STATUS_TRIG_DONE) == status = (cfg & EXYNOS_I80STATUS_TRIG_DONE) ==
@ -215,58 +215,58 @@ int exynos_is_i80_frame_done(struct vidinfo *pvid)
return status; return status;
} }
static void exynos_fimd_lcd_on(struct vidinfo *pvid) static void exynos_fimd_lcd_on(struct vidinfo *priv)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
/* display on */ /* display on */
cfg = readl(&fimd_ctrl->vidcon0); cfg = readl(&reg->vidcon0);
cfg |= (EXYNOS_VIDCON0_ENVID_ENABLE | EXYNOS_VIDCON0_ENVID_F_ENABLE); cfg |= (EXYNOS_VIDCON0_ENVID_ENABLE | EXYNOS_VIDCON0_ENVID_F_ENABLE);
writel(cfg, &fimd_ctrl->vidcon0); writel(cfg, &reg->vidcon0);
} }
static void exynos_fimd_window_on(struct vidinfo *pvid, unsigned int win_id) static void exynos_fimd_window_on(struct vidinfo *priv, unsigned int win_id)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
/* enable window */ /* enable window */
cfg = readl((unsigned int)&fimd_ctrl->wincon0 + cfg = readl((unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
cfg |= EXYNOS_WINCON_ENWIN_ENABLE; cfg |= EXYNOS_WINCON_ENWIN_ENABLE;
writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + writel(cfg, (unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
cfg = readl(&fimd_ctrl->winshmap); cfg = readl(&reg->winshmap);
cfg |= EXYNOS_WINSHMAP_CH_ENABLE(win_id); cfg |= EXYNOS_WINSHMAP_CH_ENABLE(win_id);
writel(cfg, &fimd_ctrl->winshmap); writel(cfg, &reg->winshmap);
} }
void exynos_fimd_lcd_off(struct vidinfo *pvid) void exynos_fimd_lcd_off(struct vidinfo *priv)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
cfg = readl(&fimd_ctrl->vidcon0); cfg = readl(&reg->vidcon0);
cfg &= (EXYNOS_VIDCON0_ENVID_DISABLE | EXYNOS_VIDCON0_ENVID_F_DISABLE); cfg &= (EXYNOS_VIDCON0_ENVID_DISABLE | EXYNOS_VIDCON0_ENVID_F_DISABLE);
writel(cfg, &fimd_ctrl->vidcon0); writel(cfg, &reg->vidcon0);
} }
void exynos_fimd_window_off(struct vidinfo *pvid, unsigned int win_id) void exynos_fimd_window_off(struct vidinfo *priv, unsigned int win_id)
{ {
struct exynos_fb *fimd_ctrl = pvid->fimd_ctrl; struct exynos_fb *reg = priv->reg;
unsigned int cfg = 0; unsigned int cfg = 0;
cfg = readl((unsigned int)&fimd_ctrl->wincon0 + cfg = readl((unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
cfg &= EXYNOS_WINCON_ENWIN_DISABLE; cfg &= EXYNOS_WINCON_ENWIN_DISABLE;
writel(cfg, (unsigned int)&fimd_ctrl->wincon0 + writel(cfg, (unsigned int)&reg->wincon0 +
EXYNOS_WINCON(win_id)); EXYNOS_WINCON(win_id));
cfg = readl(&fimd_ctrl->winshmap); cfg = readl(&reg->winshmap);
cfg &= ~EXYNOS_WINSHMAP_CH_DISABLE(win_id); cfg &= ~EXYNOS_WINSHMAP_CH_DISABLE(win_id);
writel(cfg, &fimd_ctrl->winshmap); writel(cfg, &reg->winshmap);
} }
/* /*
@ -307,9 +307,9 @@ void exynos_fimd_disable_sysmmu(void)
} }
} }
void exynos_fimd_lcd_init(struct vidinfo *pvid, ulong lcd_base_address) void exynos_fimd_lcd_init(struct vidinfo *priv, ulong lcd_base_address)
{ {
struct exynos_fb *fimd_ctrl; struct exynos_fb *reg;
unsigned int cfg = 0, rgb_mode; unsigned int cfg = 0, rgb_mode;
unsigned int offset; unsigned int offset;
unsigned int node; unsigned int node;
@ -319,105 +319,105 @@ void exynos_fimd_lcd_init(struct vidinfo *pvid, ulong lcd_base_address)
if (node <= 0) if (node <= 0)
debug("exynos_fb: Can't get device node for fimd\n"); debug("exynos_fb: Can't get device node for fimd\n");
fimd_ctrl = (struct exynos_fb *)fdtdec_get_addr(gd->fdt_blob, node, reg = (struct exynos_fb *)fdtdec_get_addr(gd->fdt_blob, node,
"reg"); "reg");
if (fimd_ctrl == NULL) if (reg == NULL)
debug("Can't get the FIMD base address\n"); debug("Can't get the FIMD base address\n");
pvid->fimd_ctrl = fimd_ctrl; priv->reg = reg;
if (fdtdec_get_bool(gd->fdt_blob, node, "samsung,disable-sysmmu")) if (fdtdec_get_bool(gd->fdt_blob, node, "samsung,disable-sysmmu"))
exynos_fimd_disable_sysmmu(); exynos_fimd_disable_sysmmu();
offset = exynos_fimd_get_base_offset(); offset = exynos_fimd_get_base_offset();
rgb_mode = pvid->rgb_mode; rgb_mode = priv->rgb_mode;
if (pvid->interface_mode == FIMD_RGB_INTERFACE) { if (priv->interface_mode == FIMD_RGB_INTERFACE) {
cfg |= EXYNOS_VIDCON0_VIDOUT_RGB; cfg |= EXYNOS_VIDCON0_VIDOUT_RGB;
writel(cfg, &fimd_ctrl->vidcon0); writel(cfg, &reg->vidcon0);
cfg = readl(&fimd_ctrl->vidcon2); cfg = readl(&reg->vidcon2);
cfg &= ~(EXYNOS_VIDCON2_WB_MASK | cfg &= ~(EXYNOS_VIDCON2_WB_MASK |
EXYNOS_VIDCON2_TVFORMATSEL_MASK | EXYNOS_VIDCON2_TVFORMATSEL_MASK |
EXYNOS_VIDCON2_TVFORMATSEL_YUV_MASK); EXYNOS_VIDCON2_TVFORMATSEL_YUV_MASK);
cfg |= EXYNOS_VIDCON2_WB_DISABLE; cfg |= EXYNOS_VIDCON2_WB_DISABLE;
writel(cfg, &fimd_ctrl->vidcon2); writel(cfg, &reg->vidcon2);
/* set polarity */ /* set polarity */
cfg = 0; cfg = 0;
if (!pvid->vl_clkp) if (!priv->vl_clkp)
cfg |= EXYNOS_VIDCON1_IVCLK_RISING_EDGE; cfg |= EXYNOS_VIDCON1_IVCLK_RISING_EDGE;
if (!pvid->vl_hsp) if (!priv->vl_hsp)
cfg |= EXYNOS_VIDCON1_IHSYNC_INVERT; cfg |= EXYNOS_VIDCON1_IHSYNC_INVERT;
if (!pvid->vl_vsp) if (!priv->vl_vsp)
cfg |= EXYNOS_VIDCON1_IVSYNC_INVERT; cfg |= EXYNOS_VIDCON1_IVSYNC_INVERT;
if (!pvid->vl_dp) if (!priv->vl_dp)
cfg |= EXYNOS_VIDCON1_IVDEN_INVERT; cfg |= EXYNOS_VIDCON1_IVDEN_INVERT;
writel(cfg, (unsigned int)&fimd_ctrl->vidcon1 + offset); writel(cfg, (unsigned int)&reg->vidcon1 + offset);
/* set timing */ /* set timing */
cfg = EXYNOS_VIDTCON0_VFPD(pvid->vl_vfpd - 1); cfg = EXYNOS_VIDTCON0_VFPD(priv->vl_vfpd - 1);
cfg |= EXYNOS_VIDTCON0_VBPD(pvid->vl_vbpd - 1); cfg |= EXYNOS_VIDTCON0_VBPD(priv->vl_vbpd - 1);
cfg |= EXYNOS_VIDTCON0_VSPW(pvid->vl_vspw - 1); cfg |= EXYNOS_VIDTCON0_VSPW(priv->vl_vspw - 1);
writel(cfg, (unsigned int)&fimd_ctrl->vidtcon0 + offset); writel(cfg, (unsigned int)&reg->vidtcon0 + offset);
cfg = EXYNOS_VIDTCON1_HFPD(pvid->vl_hfpd - 1); cfg = EXYNOS_VIDTCON1_HFPD(priv->vl_hfpd - 1);
cfg |= EXYNOS_VIDTCON1_HBPD(pvid->vl_hbpd - 1); cfg |= EXYNOS_VIDTCON1_HBPD(priv->vl_hbpd - 1);
cfg |= EXYNOS_VIDTCON1_HSPW(pvid->vl_hspw - 1); cfg |= EXYNOS_VIDTCON1_HSPW(priv->vl_hspw - 1);
writel(cfg, (unsigned int)&fimd_ctrl->vidtcon1 + offset); writel(cfg, (unsigned int)&reg->vidtcon1 + offset);
/* set lcd size */ /* set lcd size */
cfg = EXYNOS_VIDTCON2_HOZVAL(pvid->vl_col - 1) | cfg = EXYNOS_VIDTCON2_HOZVAL(priv->vl_col - 1) |
EXYNOS_VIDTCON2_LINEVAL(pvid->vl_row - 1) | EXYNOS_VIDTCON2_LINEVAL(priv->vl_row - 1) |
EXYNOS_VIDTCON2_HOZVAL_E(pvid->vl_col - 1) | EXYNOS_VIDTCON2_HOZVAL_E(priv->vl_col - 1) |
EXYNOS_VIDTCON2_LINEVAL_E(pvid->vl_row - 1); EXYNOS_VIDTCON2_LINEVAL_E(priv->vl_row - 1);
writel(cfg, (unsigned int)&fimd_ctrl->vidtcon2 + offset); writel(cfg, (unsigned int)&reg->vidtcon2 + offset);
} }
/* set display mode */ /* set display mode */
cfg = readl(&fimd_ctrl->vidcon0); cfg = readl(&reg->vidcon0);
cfg &= ~EXYNOS_VIDCON0_PNRMODE_MASK; cfg &= ~EXYNOS_VIDCON0_PNRMODE_MASK;
cfg |= (rgb_mode << EXYNOS_VIDCON0_PNRMODE_SHIFT); cfg |= (rgb_mode << EXYNOS_VIDCON0_PNRMODE_SHIFT);
writel(cfg, &fimd_ctrl->vidcon0); writel(cfg, &reg->vidcon0);
/* set par */ /* set par */
exynos_fimd_set_par(pvid, pvid->win_id); exynos_fimd_set_par(priv, priv->win_id);
/* set memory address */ /* set memory address */
exynos_fimd_set_buffer_address(pvid, pvid->win_id, lcd_base_address); exynos_fimd_set_buffer_address(priv, priv->win_id, lcd_base_address);
/* set buffer size */ /* set buffer size */
cfg = EXYNOS_VIDADDR_PAGEWIDTH(pvid->vl_col * cfg = EXYNOS_VIDADDR_PAGEWIDTH(priv->vl_col *
NBITS(pvid->vl_bpix) / 8) | NBITS(priv->vl_bpix) / 8) |
EXYNOS_VIDADDR_PAGEWIDTH_E(pvid->vl_col * EXYNOS_VIDADDR_PAGEWIDTH_E(priv->vl_col *
NBITS(pvid->vl_bpix) / 8) | NBITS(priv->vl_bpix) / 8) |
EXYNOS_VIDADDR_OFFSIZE(0) | EXYNOS_VIDADDR_OFFSIZE(0) |
EXYNOS_VIDADDR_OFFSIZE_E(0); EXYNOS_VIDADDR_OFFSIZE_E(0);
writel(cfg, (unsigned int)&fimd_ctrl->vidw00add2 + writel(cfg, (unsigned int)&reg->vidw00add2 +
EXYNOS_BUFFER_SIZE(pvid->win_id)); EXYNOS_BUFFER_SIZE(priv->win_id));
/* set clock */ /* set clock */
exynos_fimd_set_clock(pvid); exynos_fimd_set_clock(priv);
/* set rgb mode to dual lcd. */ /* set rgb mode to dual lcd. */
exynos_fimd_set_dualrgb(pvid, pvid->dual_lcd_enabled); exynos_fimd_set_dualrgb(priv, priv->dual_lcd_enabled);
/* display on */ /* display on */
exynos_fimd_lcd_on(pvid); exynos_fimd_lcd_on(priv);
/* window on */ /* window on */
exynos_fimd_window_on(pvid, pvid->win_id); exynos_fimd_window_on(priv, priv->win_id);
exynos_fimd_set_dp_clkcon(pvid, pvid->dp_enabled); exynos_fimd_set_dp_clkcon(priv, priv->dp_enabled);
} }
unsigned long exynos_fimd_calc_fbsize(struct vidinfo *pvid) unsigned long exynos_fimd_calc_fbsize(struct vidinfo *priv)
{ {
return pvid->vl_col * pvid->vl_row * (NBITS(pvid->vl_bpix) / 8); return priv->vl_col * priv->vl_row * (NBITS(priv->vl_bpix) / 8);
} }
ushort *configuration_get_cmap(void) ushort *configuration_get_cmap(void)

2
include/exynos_lcd.h
View file

@ -75,7 +75,7 @@ typedef struct vidinfo {
unsigned int sclk_div; unsigned int sclk_div;
unsigned int dual_lcd_enabled; unsigned int dual_lcd_enabled;
struct exynos_fb *fimd_ctrl; struct exynos_fb *reg;
struct exynos_platform_mipi_dsim *dsim_platform_data_dt; struct exynos_platform_mipi_dsim *dsim_platform_data_dt;
} vidinfo_t; } vidinfo_t;