Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

video: exynos_dp: Improve EDID error handling

Browse source 
EDID error handling has 2 problems:
 - It doesn't fail as early as it can
 - The retry counts for i2c and aux transactions are huge

This patch fails if the initial i2c transaction fails, and reduces the
aux and i2c retry counts down to 3.

[jg1.han@samsung.com: reduced the retry count of exynos_dp_read_byte_from_dpcd()]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
This commit is contained in:
Sean Paul 2012-11-01 02:13:00 +00:00 committed by Jingoo Han
parent 49ce41f38b
commit 99f541524c
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/video/exynos/exynos_dp_core.c
View file

@ -91,9 +91,11 @@ static int exynos_dp_read_edid(struct exynos_dp_device *dp)
*/ */
/* 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, I2C_EDID_DEVICE_ADDR, retval = exynos_dp_read_byte_from_i2c(dp, I2C_EDID_DEVICE_ADDR,
EDID_EXTENSION_FLAG, EDID_EXTENSION_FLAG,
&extend_block); &extend_block);
if (retval)
return retval;
if (extend_block > 0) { if (extend_block > 0) {
dev_dbg(dp->dev, "EDID data includes a single extension!\n"); dev_dbg(dp->dev, "EDID data includes a single extension!\n");
@ -182,14 +184,15 @@ static int exynos_dp_handle_edid(struct exynos_dp_device *dp)
int retval; int retval;
/* Read DPCD DPCD_ADDR_DPCD_REV~RECEIVE_PORT1_CAP_1 */ /* Read DPCD DPCD_ADDR_DPCD_REV~RECEIVE_PORT1_CAP_1 */
exynos_dp_read_bytes_from_dpcd(dp, retval = exynos_dp_read_bytes_from_dpcd(dp, DPCD_ADDR_DPCD_REV,
DPCD_ADDR_DPCD_REV,
12, buf); 12, buf);
if (retval)
return retval;
/* Read EDID */ /* Read EDID */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
retval = exynos_dp_read_edid(dp); retval = exynos_dp_read_edid(dp);
if (retval == 0) if (!retval)
break; break;
} }

14
drivers/video/exynos/exynos_dp_reg.c
View file

@ -491,7 +491,7 @@ int exynos_dp_read_byte_from_dpcd(struct exynos_dp_device *dp,
int i; int i;
int retval; int retval;
for (i = 0; i < 10; i++) { for (i = 0; i < 3; i++) {
/* Clear AUX CH data buffer */ /* Clear AUX CH data buffer */
reg = BUF_CLR; reg = BUF_CLR;
writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL); writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL);
@ -552,7 +552,7 @@ int exynos_dp_write_bytes_to_dpcd(struct exynos_dp_device *dp,
else else
cur_data_count = count - start_offset; cur_data_count = count - start_offset;
for (i = 0; i < 10; i++) { for (i = 0; i < 3; i++) {
/* Select DPCD device address */ /* Select DPCD device address */
reg = AUX_ADDR_7_0(reg_addr + start_offset); reg = AUX_ADDR_7_0(reg_addr + start_offset);
writel(reg, dp->reg_base + EXYNOS_DP_AUX_ADDR_7_0); writel(reg, dp->reg_base + EXYNOS_DP_AUX_ADDR_7_0);
@ -617,7 +617,7 @@ int exynos_dp_read_bytes_from_dpcd(struct exynos_dp_device *dp,
cur_data_count = count - start_offset; cur_data_count = count - start_offset;
/* AUX CH Request Transaction process */ /* AUX CH Request Transaction process */
for (i = 0; i < 10; i++) { for (i = 0; i < 3; i++) {
/* Select DPCD device address */ /* Select DPCD device address */
reg = AUX_ADDR_7_0(reg_addr + start_offset); reg = AUX_ADDR_7_0(reg_addr + start_offset);
writel(reg, dp->reg_base + EXYNOS_DP_AUX_ADDR_7_0); writel(reg, dp->reg_base + EXYNOS_DP_AUX_ADDR_7_0);
@ -700,17 +700,15 @@ int exynos_dp_read_byte_from_i2c(struct exynos_dp_device *dp,
int i; int i;
int retval; int retval;
for (i = 0; i < 10; i++) { for (i = 0; i < 3; i++) {
/* Clear AUX CH data buffer */ /* Clear AUX CH data buffer */
reg = BUF_CLR; reg = BUF_CLR;
writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL); writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL);
/* Select EDID device */ /* Select EDID device */
retval = exynos_dp_select_i2c_device(dp, device_addr, reg_addr); retval = exynos_dp_select_i2c_device(dp, device_addr, reg_addr);
if (retval != 0) { if (retval != 0)
dev_err(dp->dev, "Select EDID device fail!\n");
continue; continue;
}
/* /*
* Set I2C transaction and read data * Set I2C transaction and read data
@ -750,7 +748,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp,
int retval = 0; int retval = 0;
for (i = 0; i < count; i += 16) { for (i = 0; i < count; i += 16) {
for (j = 0; j < 100; j++) { for (j = 0; j < 3; j++) {
/* Clear AUX CH data buffer */ /* Clear AUX CH data buffer */
reg = BUF_CLR; reg = BUF_CLR;
writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL); writel(reg, dp->reg_base + EXYNOS_DP_BUFFER_DATA_CTL);