Skip to contentSkip to conversation

tests/kms_chamelium: fix typo in check_analog_bridge

PATCH In review Simon Ser 3 participants 4 messages Mar 26, 2019

lore
Share & tools
lore

Simon Ser

author
#0 lore raw

PATCH 1/1 tests/kms_chamelium: fix typo in check_analog_bridge

This function checks whether a port is an analog bridge. Analog bridges provide their own EDID thus the vendor should be different from "IGT".

There was a typo that made the function always return true for VGA ports. The condition was essentially:

    thing != 'I' || thing != 'T'

which is always true.

Apparently this didn't cause any harm, but it's probably better to fix it anyway in case some tests were skipped and shouldn't.

---
 tests/kms_chamelium.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_chamelium.c +1 -1
index c2090037..2dc1049d 100644
@@ -199,7 +199,7 @@ check_analog_bridge(data_t *data, struct chamelium_port *port)
 
 	/* Analog bridges provide their own EDID */
 	if (edid_vendor[0] != 'I' || edid_vendor[1] != 'G' ||
-	    edid_vendor[0] != 'T')
+	    edid_vendor[2] != 'T')
 		return true;
 
 	return false;
Signature · 6 lines
2.21.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#1 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_chamelium: fix typo in check_analog_bridge

== Series Details ==

== Series Details ==

Series: tests/kms_chamelium: fix typo in check_analog_bridge
URL : https://patchwork.freedesktop.org/series/58583/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5815 -> IGTPW_2711
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/58583/revisions/1/mbox/

Known issues
------------

Here are the changes found in IGTPW_2711 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live_evict:
- fi-bsw-kefka: PASS -> DMESG-WARN [fdo#107709]

* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: PASS -> FAIL [fdo#103167]

* igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +1

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-apl-guc: PASS -> DMESG-WARN [fdo#108566]

* igt@runner@aborted:
- fi-bsw-kefka: NOTRUN -> FAIL [fdo#107709]

#### Possible fixes ####

* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS

* igt@i915_selftest@live_uncore:
- fi-ivb-3770: DMESG-FAIL [fdo#110210] -> PASS

* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: FAIL [fdo#103167] -> PASS

* igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS

* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#107362] -> PASS

* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: FAIL [fdo#104008] -> PASS

#### Warnings ####

* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: FAIL [fdo#103182] -> DMESG-FAIL [fdo#103182]

[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
[fdo#110210]: https://bugs.freedesktop.org/show_bug.cgi?id=110210

Participating hosts (44 -> 40)
------------------------------

Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u

Build changes
-------------

* IGT: IGT_4904 -> IGTPW_2711

CI_DRM_5815: 472ba88b1a76be18fb4ca6d688d6c5cda08cec81 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2711: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2711/
IGT_4904: b9cfd64009ca2536f7a997deabf34d88f2757511 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2711/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#2 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_chamelium: fix typo in check_analog_bridge

In reply to Simon Ser
== Series Details ==

== Series Details ==

Series: tests/kms_chamelium: fix typo in check_analog_bridge
URL : https://patchwork.freedesktop.org/series/58583/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5815_full -> IGTPW_2711_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/58583/revisions/1/mbox/

Known issues
------------

Here are the changes found in IGTPW_2711_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_params@no-blt:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +190

* igt@gem_stolen@large-object-alloc:
- shard-hsw: NOTRUN -> SKIP [fdo#109271] +22

* igt@kms_atomic_transition@6x-modeset-transitions-fencing:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

* igt@kms_busy@basic-flip-d:

    - shard-glk:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3
    - shard-hsw:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1

* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-kbl: PASS -> DMESG-WARN [fdo#110222] +1
- shard-snb: PASS -> DMESG-WARN [fdo#110222]

* igt@kms_busy@extended-pageflip-hang-newfb-render-a:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#110222] +1

* igt@kms_color@pipe-a-legacy-gamma:

    - shard-kbl:          PASS -> FAIL [fdo#104782] / [fdo#108145]
    - shard-apl:          PASS -> FAIL [fdo#104782] / [fdo#108145]
    - shard-glk:          PASS -> FAIL [fdo#104782] / [fdo#108145]

* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-kbl: PASS -> FAIL [fdo#103232]
- shard-apl: PASS -> FAIL [fdo#103232]

* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-glk: PASS -> FAIL [fdo#103232]

* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-glk: NOTRUN -> FAIL [fdo#103232]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: PASS -> FAIL [fdo#102887] / [fdo#105363]

* igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary:

    - shard-glk:          PASS -> FAIL [fdo#103167]
    - shard-apl:          NOTRUN -> FAIL [fdo#103167]
    - shard-kbl:          PASS -> FAIL [fdo#103167]

* igt@kms_frontbuffer_tracking@fbcpsr-shrfb-scaledprimary:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +41

* igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +32

* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +20

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparant-fb:
- shard-apl: NOTRUN -> FAIL [fdo#108145]

* igt@kms_plane_scaling@pipe-c-scaler-with-pixel-format:
- shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278]

* igt@kms_psr@sprite_mmap_cpu:
- shard-kbl: NOTRUN -> SKIP [fdo#109271]

* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> FAIL [fdo#99912]

#### Possible fixes ####

* igt@gem_softpin@noreloc-s3:
- shard-hsw: INCOMPLETE [fdo#103540] -> PASS
- shard-apl: INCOMPLETE [fdo#103927] -> PASS

* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-hsw: DMESG-WARN [fdo#110222] -> PASS
- shard-kbl: DMESG-WARN [fdo#110222] -> PASS

* igt@kms_color@pipe-b-ctm-0-5:
- shard-glk: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: FAIL [fdo#105767] -> PASS

* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack:
- shard-glk: FAIL [fdo#103167] -> PASS

* igt@kms_plane_lowres@pipe-a-tiling-none:
- shard-snb: SKIP [fdo#109271] -> PASS +1

* igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping:
- shard-glk: SKIP [fdo#109271] / [fdo#109278] -> PASS +2

* igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: DMESG-FAIL [fdo#105763] -> PASS

* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
- shard-kbl: FAIL [fdo#99912] -> PASS

* igt@kms_vblank@pipe-a-ts-continuation-dpms-rpm:
- shard-apl: FAIL [fdo#104894] -> PASS +2

* igt@perf_pmu@rc6-runtime-pm:

    - shard-glk:          FAIL [fdo#105010] -> PASS
    - shard-kbl:          FAIL [fdo#105010] -> PASS
    - shard-hsw:          FAIL [fdo#105010] -> PASS

* igt@tools_test@tools_test:
- shard-glk: SKIP [fdo#109271] -> PASS +1

#### Warnings ####

* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: DMESG-FAIL [fdo#105763] -> INCOMPLETE [fdo#103665]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133

Participating hosts (10 -> 5)
------------------------------

Missing (5): shard-skl pig-hsw-4770r pig-glk-j5005 shard-iclb pig-skl-6260u

Build changes
-------------

* IGT: IGT_4904 -> IGTPW_2711
* Piglit: piglit_4509 -> None

CI_DRM_5815: 472ba88b1a76be18fb4ca6d688d6c5cda08cec81 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2711: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2711/
IGT_4904: b9cfd64009ca2536f7a997deabf34d88f2757511 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2711/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Acked-by on v1 1/1
#3 lore raw
In reply to Simon Ser
Quoted 7 lines · Simon Ser

This function checks whether a port is an analog bridge. Analog bridges provide their own EDID thus the vendor should be different from "IGT".

There was a typo that made the function always return true for VGA ports. The condition was essentially:

Quoted 7 lines
     thing != 'I' || thing != 'T'

which is always true.

Apparently this didn't cause any harm, but it's probably better to fix it anyway in case some tests were skipped and shouldn't.

LGTM.

Quoted 11 lines
---
  tests/kms_chamelium.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_chamelium.c +0 -0
index c2090037..2dc1049d 100644

tests/kms_chamelium.c check_analog_bridge(data_t *data, struct chamelium_port *port) · line 205

Quoted 8 lines
tests/kms_chamelium.c +1 -1
@@ -199,7 +199,7 @@ check_analog_bridge(data_t *data, struct chamelium_port *port)
 
  	/* Analog bridges provide their own EDID */
  	if (edid_vendor[0] != 'I' || edid_vendor[1] != 'G' ||
-	    edid_vendor[0] != 'T')
+	    edid_vendor[2] != 'T')
  		return true;
 
  	return false;

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev