Skip to contentSkip to conversation

lib/igt_kms.c: Unconditionally include poll.h

PATCH In review Petri Latvala 4 participants 6 messages Jan 9, 2018 – Jan 10, 2018 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/igt_kms.c: Unconditionally include poll.h

Commit 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.") added a use of poll() to igt_kms.c, but that file only includes poll.h when HAVE_UDEV is defined. Move the include outside the UDEV conditional.

Fixes 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.")
Cc Maarten Lankhorst <[email protected]>
Cc Chris Wilson <[email protected]>
---
 lib/igt_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/igt_kms.c +1 -1
index ec3b7167..069752ec 100644
@@ -40,8 +40,8 @@
 #endif
 #ifdef HAVE_UDEV
 #include <libudev.h>
-#include <poll.h>
 #endif
+#include <poll.h>
 #include <errno.h>
 #include <time.h>
 
Signature · 6 lines
2.14.1

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

Quoting Petri Latvala (2018-01-09 10:11:24)

Quoted 4 lines

Commit 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.") added a use of poll() to igt_kms.c, but that file only includes poll.h when HAVE_UDEV is defined. Move the include outside the UDEV conditional.

We should probably stop making udev conditional. We rely on udev for uevent detection, in particular for detecting GPU hangs. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for lib/igt_kms.c: Unconditionally include poll.h

In reply to Petri Latvala
== Series Details ==

== Series Details ==

Series: lib/igt_kms.c: Unconditionally include poll.h
URL : https://patchwork.freedesktop.org/series/36181/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 834321a5d76a16783000441a02d7e79e72be9cc9 tools: Cannonlake port clock programming

with latest DRM-Tip kernel build CI_DRM_3609
6313bf1abff3 drm-tip: 2018y-01m-09d-09h-14m-50s UTC integration manifest

No testlist changes.

Test debugfs_test:

        Subgroup read_all_entries:
                dmesg-warn -> FAIL       (fi-elk-e7500) fdo#103989 +2
                pass       -> INCOMPLETE (fi-snb-2520m) fdo#103713
                dmesg-warn -> PASS       (fi-bdw-gvtdvm) fdo#103938 +1
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                fail       -> PASS       (fi-ivb-3520m) fdo#103375 +2

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103938 https://bugs.freedesktop.org/show_bug.cgi?id=103938
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:423s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:428s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:373s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:496s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:282s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:487s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:488s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:474s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:460s
fi-elk-e7500     total:224  pass:168  dwarn:9   dfail:0   fail:1   skip:45 
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:276s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:514s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:393s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:403s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:413s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:458s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:415s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:464s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:500s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:458s
fi-kbl-r         total:288  pass:260  dwarn:1   dfail:0   fail:0   skip:27  time:503s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:586s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:433s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:511s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:529s
fi-skl-6700k2    total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:497s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:478s
fi-snb-2520m     total:3    pass:2    dwarn:0   dfail:0   fail:0   skip:0  
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:408s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:567s
fi-glk-dsi       total:288  pass:257  dwarn:0   dfail:0   fail:1   skip:30  time:486s

== Logs ==

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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Petri Latvala

Quoting Petri Latvala (2018-01-09 10:11:24)

Quoted 9 lines

Commit 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.") added a use of poll() to igt_kms.c, but that file only includes poll.h when HAVE_UDEV is defined. Move the include outside the UDEV conditional.

Fixes 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.")
Cc Maarten Lankhorst <[email protected]>
Cc Chris Wilson <[email protected]>

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.IGT: failure for lib/igt_kms.c: Unconditionally include poll.h

In reply to Petri Latvala
== Series Details ==

== Series Details ==

Series: lib/igt_kms.c: Unconditionally include poll.h
URL : https://patchwork.freedesktop.org/series/36181/
State : failure

== Summary ==

Warning: bzip CI_DRM_3609/shard-glkb6/results32.json.bz2 wasn't in correct JSON format Test kms_setmode:

        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test kms_cursor_crc:
        Subgroup cursor-64x64-suspend:
                skip       -> PASS       (shard-snb) fdo#102365
                skip       -> PASS       (shard-hsw) fdo#103540
        Subgroup cursor-64x21-onscreen:
                skip       -> PASS       (shard-hsw)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
                pass       -> FAIL       (shard-snb) fdo#101623 +1
Test drv_suspend:
        Subgroup sysfs-reader:
                pass       -> SKIP       (shard-snb)
Test gem_eio:
        Subgroup in-flight:
                pass       -> DMESG-WARN (shard-snb) fdo#104058
Test kms_plane:
        Subgroup plane-position-covered-pipe-b-planes:
                pass       -> INCOMPLETE (shard-hsw)

fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058

shard-hsw        total:2637 pass:1493 dwarn:1   dfail:0   fail:9   skip:1133 time:8934s
shard-snb        total:2713 pass:1308 dwarn:2   dfail:0   fail:11  skip:1392 time:7901s
Blacklisted hosts:
shard-apl        total:2636 pass:1639 dwarn:1   dfail:0   fail:26  skip:970 time:13194s
shard-kbl        total:2695 pass:1783 dwarn:1   dfail:0   fail:30  skip:880 time:10359s

== Logs ==

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

Reviewed-by on v1 1/1
#5 lore raw
In reply to Petri Latvala
Quoted 10 lines · Petri Latvala

Commit 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.") added a use of poll() to igt_kms.c, but that file only includes poll.h when HAVE_UDEV is defined. Move the include outside the UDEV conditional.

Fixes 98c64b33a793 ("lib/igt_kms: Drop all stale events on first commit.")
Cc Maarten Lankhorst <[email protected]>
Cc Chris Wilson <[email protected]>

I have also hit this issue, and spun up locally the equivalent patch fix, so also gets my:

Quoted 21 lines
---
 lib/igt_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/igt_kms.c +1 -2
index ec3b7167..069752ec 100644
@@ -40,8 +40,8 @@
 #endif
 #ifdef HAVE_UDEV
 #include <libudev.h>
-#include <poll.h>
 #endif
+#include <poll.h>
 #include <errno.h>
 #include <time.h>
 
--

2.14.1

Quoted 5 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx