* [igt-dev] [PATCH i-g-t 1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3
@ 2019-03-08 19:01 Jani Nikula
2019-03-08 19:01 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size Jani Nikula
2019-03-09 1:42 ` [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 Patchwork
0 siblings, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2019-03-08 19:01 UTC (permalink / raw)
To: igt-dev; +Cc: jani.nikula
The GPIO element is three bytes in sequence v3.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
tools/intel_vbt_decode.c | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index e6e06b1b5618..de4cc88a06dd 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -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;
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size
2019-03-08 19:01 [igt-dev] [PATCH i-g-t 1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3 Jani Nikula
@ 2019-03-08 19:01 ` Jani Nikula
2019-03-08 19:09 ` Ville Syrjälä
2019-03-09 1:42 ` [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 Patchwork
1 sibling, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2019-03-08 19:01 UTC (permalink / raw)
To: igt-dev; +Cc: jani.nikula
Cross check against the element dumper return value to catch
inconsistencies.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
tools/intel_vbt_decode.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
index de4cc88a06dd..5f3db808d70d 100644
--- a/tools/intel_vbt_decode.c
+++ b/tools/intel_vbt_decode.c
@@ -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;
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size
2019-03-08 19:01 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size Jani Nikula
@ 2019-03-08 19:09 ` Ville Syrjälä
2019-03-08 19:28 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2019-03-08 19:09 UTC (permalink / raw)
To: Jani Nikula; +Cc: igt-dev
On Fri, Mar 08, 2019 at 09:01:07PM +0200, Jani Nikula wrote:
> Cross check against the element dumper return value to catch
> inconsistencies.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> tools/intel_vbt_decode.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
> index de4cc88a06dd..5f3db808d70d 100644
> --- a/tools/intel_vbt_decode.c
> +++ b/tools/intel_vbt_decode.c
> @@ -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.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
for both
> } else if (operation_size) {
> /* We have size, skip. */
> data += operation_size;
> --
> 2.20.1
--
Ville Syrjälä
Intel
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size
2019-03-08 19:09 ` Ville Syrjälä
@ 2019-03-08 19:28 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2019-03-08 19:28 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: igt-dev
On Fri, 08 Mar 2019, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Mar 08, 2019 at 09:01:07PM +0200, Jani Nikula wrote:
>> Cross check against the element dumper return value to catch
>> inconsistencies.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> tools/intel_vbt_decode.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
>> index de4cc88a06dd..5f3db808d70d 100644
>> --- a/tools/intel_vbt_decode.c
>> +++ b/tools/intel_vbt_decode.c
>> @@ -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.
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.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> for both
>
>> } else if (operation_size) {
>> /* We have size, skip. */
>> data += operation_size;
>> --
>> 2.20.1
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [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
2019-03-08 19:01 [igt-dev] [PATCH i-g-t 1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3 Jani Nikula
2019-03-08 19:01 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size Jani Nikula
@ 2019-03-09 1:42 ` Patchwork
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-03-09 1:42 UTC (permalink / raw)
To: Jani Nikula; +Cc: igt-dev
== 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
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-09 1:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-08 19:01 [igt-dev] [PATCH i-g-t 1/2] tools/intel_vbt_decode: fix mipi gpio element dumping for sequence v3 Jani Nikula
2019-03-08 19:01 ` [igt-dev] [PATCH i-g-t 2/2] tools/intel_vbt_decode: check inconsistent sequence element size Jani Nikula
2019-03-08 19:09 ` Ville Syrjälä
2019-03-08 19:28 ` Jani Nikula
2019-03-09 1:42 ` [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 Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.