Signed-off-by: Thomas Wood thomas.wood@intel.com --- edid-decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/edid-decode.c b/edid-decode.c index d3e3118..3830e0c 100644 --- a/edid-decode.c +++ b/edid-decode.c @@ -649,7 +649,7 @@ static const char *edid_cea_modes[] = { "1440x240@60Hz", "1440x240@60Hz", "2880x480i@60Hz", - "2880x480i@60Hz" + "2880x480i@60Hz", "2880x240@60Hz", "2880x240@60Hz", "1440x480@60Hz",
Signed-off-by: Thomas Wood thomas.wood@intel.com --- edid-decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/edid-decode.c b/edid-decode.c index 3830e0c..b710bb5 100644 --- a/edid-decode.c +++ b/edid-decode.c @@ -711,7 +711,7 @@ cea_video_block(unsigned char *x) int i; int length = x[0] & 0x1f;
- for (i = 1; i < length; i++) { + for (i = 1; i <= length; i++) { unsigned char vic = x[i] & 0x7f; unsigned char native = x[i] & 0x80; const char *mode;
Signed-off-by: Thomas Wood thomas.wood@intel.com --- edid-decode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/edid-decode.c b/edid-decode.c index b710bb5..4265843 100644 --- a/edid-decode.c +++ b/edid-decode.c @@ -715,10 +715,11 @@ cea_video_block(unsigned char *x) unsigned char vic = x[i] & 0x7f; unsigned char native = x[i] & 0x80; const char *mode; + int index;
- vic--; - if (vic < ARRAY_SIZE(edid_cea_modes)) - mode = edid_cea_modes[vic]; + index = vic - 1; + if (index < ARRAY_SIZE(edid_cea_modes)) + mode = edid_cea_modes[index]; else mode = "Unknown mode";
On Fri, Sep 27, 2013 at 12:26:59PM +0100, Thomas Wood wrote:
Signed-off-by: Thomas Wood thomas.wood@intel.com
For the series (that fixes 2 embarassing bugs from me and 1 long standing one that wasn't parsing the last CEA VIC):
Reviewed-by: Damien Lespiau damien.lespiau@intel.com
On Fri, Sep 27, 2013 at 12:26:59PM +0100, Thomas Wood wrote:
Signed-off-by: Thomas Wood thomas.wood@intel.com
Thanks for the series, all pushed with the virtual nod from Ajax on IRC.
dri-devel@lists.freedesktop.org
-
Damien Lespiau -
Thomas Wood