tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3
PATCH 1/2 tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3
The GPIO element is three bytes in sequence v3.
--- tools/intel_vbt_decode.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)
tools/intel_vbt_decode.c +23 -13
@@ -1151,7 +1151,7 @@ static void dump_mipi_config(struct context *context,printf ("\t\tPanel power cycle delay: %d\n" , pps->panel_power_cycle_delay); } -static const uint8_t *mipi_dump_send_packet (const uint8_t *data) +static const uint8_t *mipi_dump_send_packet (const uint8_t *data,uint8_t seq_version) {uint8_t flags, type;uint16_t len, i;
@@ -1174,29 +1174,39 @@ static const uint8_t *mipi_dump_send_packet(const uint8_t *data)return data; } -static const uint8_t *mipi_dump_delay (const uint8_t *data) +static const uint8_t *mipi_dump_delay (const uint8_t *data,uint8_t seq_version) {printf ("\t\tDelay: %u us\n" , *((const uint32_t *)data));return data +4 ; } -static const uint8_t *mipi_dump_gpio (const uint8_t *data) +static const uint8_t *mipi_dump_gpio (const uint8_t *data,uint8_t seq_version) { -uint8_t index, flags; +uint8_t gpio_source, gpio_index =0 , gpio_number; +bool value; - index = *data++; - flags = *data++; +if (seq_version >=3 ) + gpio_index = *data++; -printf ("\t\tGPIO index %u, source %d, set %d\n" , - index, - (flags >>1 ) &3 , - flags &1 ); + gpio_number = *data++; + +/* gpio source in sequence v2 only */ +if (seq_version ==2 ) + gpio_source = (*data >>1 ) &3 ; +else + gpio_source =0 ; + +/* pull up/down */ + value = *data++ &1 ; + +printf ("\t\tGPIO index %u, number %u, source %u, set %d\n" , + gpio_index, gpio_number, gpio_source, value);return data; } -static const uint8_t *mipi_dump_i2c (const uint8_t *data) +static const uint8_t *mipi_dump_i2c (const uint8_t *data,uint8_t seq_version) {uint8_t flags, index, bus, offset, len, i;uint16_t address;
@@ -1218,7 +1228,7 @@ static const uint8_t *mipi_dump_i2c(const uint8_t *data)return data; } -typedef const uint8_t * (*fn_mipi_elem_dump )(const uint8_t *data); +typedef const uint8_t * (*fn_mipi_elem_dump )(const uint8_t *data,uint8_t seq_version);static const fn_mipi_elem_dump dump_elem[] = { [MIPI_SEQ_ELEM_SEND_PKT ] = mipi_dump_send_packet,
@@ -1279,7 +1289,7 @@ static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) operation_size = *data++;if (mipi_elem_dump) { - data =mipi_elem_dump (data); + data =mipi_elem_dump (data, seq_version); }else if (operation_size) {/* We have size, skip. */ data += operation_size;
Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH 2/2 tools/intel_vbt_decode: check inconsistent sequence element size
Cross check against the element dumper return value to catch inconsistencies.
--- tools/intel_vbt_decode.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/intel_vbt_decode.c +6 -0
@@ -1289,7 +1289,13 @@ static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) operation_size = *data++;if (mipi_elem_dump) { +const uint8_t *next = data + operation_size; + data =mipi_elem_dump (data, seq_version); + +if (operation_size && next != data) +printf ("Error: Inconsistent operation size: %d\n" , + operation_size); }else if (operation_size) {/* We have size, skip. */ data += operation_size;
Signature · 6 lines
2.20.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Re: [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size
Quoted 13 lines · Jani Nikula
Cross check against the element dumper return value to catch inconsistencies.
Signed-off-by Jani Nikula <[email protected]>--- tools/intel_vbt_decode.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/intel_vbt_decode.c +0
-0
tools/intel_vbt_decode.c static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) · line 1298
Quoted 10 lines
tools/intel_vbt_decode.c +6
-0@@ -1289,7 +1289,13 @@ static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) operation_size = *data++;if (mipi_elem_dump) { +const uint8_t *next = data + operation_size; + data =mipi_elem_dump (data, seq_version); + +if (operation_size && next != data) +printf ("Error: Inconsistent operation size: %d\n" , + operation_size);
I guess non-fatal error is better than the assert I had.
for both
Quoted 5 lines
tools/intel_vbt_decode.c +0
-0}else if (operation_size) {/* We have size, skip. */ data += operation_size;Signature · 1 line
2.20.1
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Re: [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size
Quoted 16 lines · Ville Syrjälä
Quoted 15 lines · Jani Nikula
Cross check against the element dumper return value to catch inconsistencies.
Signed-off-by Jani Nikula <[email protected]>--- tools/intel_vbt_decode.c | 6 ++++++ 1 file changed, 6 insertions(+)tools/intel_vbt_decode.c +0
-0@@ -1289,7 +1289,13 @@ static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) operation_size = *data++;
Quoted 10 lines
tools/intel_vbt_decode.c static const uint8_t *dump_sequence(const uint8_t *data, uint8_t seq_version) · line 1298
Quoted 8 lines
tools/intel_vbt_decode.c +6
-0if (mipi_elem_dump) { +const uint8_t *next = data + operation_size; + data =mipi_elem_dump (data, seq_version); + +if (operation_size && next != data) +printf ("Error: Inconsistent operation size: %d\n" , + operation_size);I guess non-fatal error is better than the assert I had.
I think so too. I picked up patches 1 and 3 from your series, and this one, and pushed the lot to igt.
Thanks,
Jani.
Quoted 9 lines
Reviewed-by Ville Syrjälä <[email protected]>for both
Quoted 5 lines
tools/intel_vbt_decode.c +0
-0}else if (operation_size) {/* We have size, skip. */ data += operation_size;Signature · 1 line
2.20.1
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [i-g-t,1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3
URL : https://patchwork.freedesktop.org/series/57765/
State : failure
== Summary ==
Applying: tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3 Using index info to reconstruct a base tree...
M tools/intel_vbt_decode.c
Falling back to patching base and 3-way merge...
Auto-merging tools/intel_vbt_decode.c
CONFLICT (content): Merge conflict in tools/intel_vbt_decode.c
Patch failed at 0001 tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3 When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev