aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-03-03 09:09:36 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-06-26 06:01:51 -0400
commit713456db179356c6b32a50ea1910fc509615c457 (patch)
tree6d125d3e157e9d92d95d874a44e39df8ce60ae70
parent2e48cecb55435e10c93c6aface1a1c7ef32f4e71 (diff)
drm/i2c: tda998x: faster polling for edid
One of Jean-Francois patches changed the EDID polling to once every 10ms for 10 interations, whereas the original code did 1ms for 100 interations. This appears to cause boot-time detection to take noticably longer. Revert this change. Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/gpu/drm/i2c/tda998x_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index b98c969aeffa..3ff7d0713bfb 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1048,8 +1048,8 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk)
1048 return i; 1048 return i;
1049 } 1049 }
1050 } else { 1050 } else {
1051 for (i = 10; i > 0; i--) { 1051 for (i = 100; i > 0; i--) {
1052 msleep(10); 1052 msleep(1);
1053 ret = reg_read(priv, REG_INT_FLAGS_2); 1053 ret = reg_read(priv, REG_INT_FLAGS_2);
1054 if (ret < 0) 1054 if (ret < 0)
1055 return ret; 1055 return ret;