Skip to contentSkip to conversation

meson: Use bufmgr stubs headers if libdrm_intel is not found

PATCH In review Arkadiusz Hiler 3 participants 6 messages Feb 20, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 meson: Use bufmgr stubs headers if libdrm_intel is not found

Just adding the .h file to lib_headers is not enough.

We have to pass 'stubs/drm' as a part of include_directories when building, so a proper -I will be issued to the compiler. This can be done by turning 'inc' into a list of include_directories()-generated objects.

Cc Liviu Dudau <[email protected]>
Cc Eric Anholt <[email protected]>
---
 lib/meson.build | 1 +
 1 file changed, 1 insertion(+)
lib/meson.build +1 -0
index 94ea0799..04b4fff6 100644
@@ -121,6 +121,7 @@ if libdrm_intel.found()
 else
 	lib_headers += 'stubs/drm/intel_bufmgr.h'
 	lib_sources += 'stubs/drm/intel_bufmgr.c'
+	inc = [ inc, include_directories('stubs/drm') ]
 endif
 
 if valgrind.found()
Signature · 6 lines
2.14.3

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

PATCH 2/2 meson: Make cairo mandatory

We use cairo all around the codebase unconditionally, yet for some reason it was an optional dependency.

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index 9036feb1..509ae5de 100644
@@ -47,7 +47,7 @@ if valgrind.found()
 	config.set('HAVE_VALGRIND', 1)
 endif
 
-cairo = dependency('cairo', version : '>1.12.0', required : false)
+cairo = dependency('cairo', version : '>1.12.0', required : true)
 
 libudev = dependency('libudev', required : false)
 if libudev.found()
Signature · 6 lines
2.14.3

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Acked-by on v1 2/2
#2 lore raw

Re: [igt-dev] [PATCH i-g-t 2/2] meson: Make cairo mandatory

Quoted 5 lines · Arkadiusz Hiler

We use cairo all around the codebase unconditionally, yet for some reason it was an optional dependency.

Cairo being mandatory is already quite the status quo.

Quoted 20 lines
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index 9036feb1..509ae5de 100644
@@ -47,7 +47,7 @@ if valgrind.found()
 	config.set('HAVE_VALGRIND', 1)
 endif
 
-cairo = dependency('cairo', version : '>1.12.0', required : false)
+cairo = dependency('cairo', version : '>1.12.0', required : true)
 
 libudev = dependency('libudev', required : false)
 if libudev.found()
Signature · 1 line
2.14.3

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

Reviewed-by Tested-by on v1 1/2
#3 lore raw
In reply to Arkadiusz Hiler
Quoted 19 lines · Arkadiusz Hiler

Just adding the .h file to lib_headers is not enough.

We have to pass 'stubs/drm' as a part of include_directories when building, so a proper -I will be issued to the compiler. This can be done by turning 'inc' into a list of include_directories()-generated objects.

Cc Liviu Dudau <[email protected]>
Cc Eric Anholt <[email protected]>
---
 lib/meson.build | 1 +
 1 file changed, 1 insertion(+)
lib/meson.build +0 -0
index 94ea0799..04b4fff6 100644

lib/meson.build if libdrm_intel.found() · line 125

Quoted 5 lines
lib/meson.build +1 -0
@@ -121,6 +121,7 @@ if libdrm_intel.found()
 else
 	lib_headers += 'stubs/drm/intel_bufmgr.h'
 	lib_sources += 'stubs/drm/intel_bufmgr.c'
+	inc = [ inc, include_directories('stubs/drm') ]
 endif

Took me a while to follow meson magickry to see why this even works.

lib_igt depends on lib_igt_build which depends on all the intermediary libraries for lib sources, and those have include_directories :
inc. Depending on lib_igt will then inherit the include_directories directive.

We don't seem to be using lib_headers at all after 1f53e0dcec7aae3c48f4ef2ca63af66a36f5c29f, we could maybe get rid of it.

The commit message is partly lying, include_directories is not necessary for proper -I flags. The other way would be to use the header files as the executable/lib's sources, but that would have been uglier. Requires the use of files() in lib/meson.build, and adding the resulting object to everything we build.

Quoted 9 lines
lib/meson.build +0 -0
 if valgrind.found()
Signature · 6 lines
2.14.3

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

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

#4 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] meson: Use bufmgr stubs headers if libdrm_intel is not found

In reply to Arkadiusz Hiler
== Series Details ==

== Series Details ==

Series: series starting with [i-g-t,1/2] meson: Use bufmgr stubs headers if libdrm_intel is not found
URL : https://patchwork.freedesktop.org/series/38569/
State : success

== Summary ==

IGT patchset tested on top of latest successful build dd61508a38b677dfffc66d5591257ee1e21a4597 lib: Remove overzealous assertion on gem_set_caching()

with latest DRM-Tip kernel build CI_DRM_3805
2c22e35947db drm-tip: 2018y-02m-20d-11h-11m-23s UTC integration manifest

No testlist changes.

Test gem_mmap_gtt:

        Subgroup basic-small-bo-tiledx:
                fail       -> PASS       (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                incomplete -> PASS       (fi-snb-2520m) fdo#103713
        Subgroup suspend-read-crc-pipe-c:
                pass       -> INCOMPLETE (fi-bxt-dsi) fdo#103927

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:417s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:424s
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:489s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:285s
fi-bxt-dsi       total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:26 
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:467s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:459s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:567s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:404s
fi-gdg-551       total:288  pass:180  dwarn:0   dfail:0   fail:0   skip:108 time:286s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:506s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:386s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:411s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:456s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:414s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:451s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:489s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:449s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:493s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:588s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:428s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:502s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:519s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:489s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:475s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:409s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:429s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:522s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:393s

== Logs ==

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

#5 lore raw

[igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/2] meson: Use bufmgr stubs headers if libdrm_intel is not found

In reply to Arkadiusz Hiler
== Series Details ==

== Series Details ==

Series: series starting with [i-g-t,1/2] meson: Use bufmgr stubs headers if libdrm_intel is not found
URL : https://patchwork.freedesktop.org/series/38569/
State : failure

== Summary ==

Test kms_rotation_crc:

        Subgroup sprite-rotation-180:
                fail       -> PASS       (shard-hsw) fdo#103925
        Subgroup primary-rotation-270:
                pass       -> FAIL       (shard-apl)
Test gem_linear_blits:
        Subgroup normal:
                skip       -> PASS       (shard-apl)
Test kms_flip:
        Subgroup wf_vblank-ts-check-interruptible:
                pass       -> FAIL       (shard-hsw) fdo#100368 +1
Test kms_ccs:
        Subgroup pipe-b-crc-sprite-planes-basic:
                pass       -> FAIL       (shard-apl)
Test kms_atomic_transition:
        Subgroup 1x-modeset-transitions-fencing:
                fail       -> PASS       (shard-apl) fdo#103207
Test kms_cursor_legacy:
        Subgroup 2x-long-flip-vs-cursor-legacy:
                fail       -> PASS       (shard-hsw) fdo#104873

fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873

shard-apl        total:3400 pass:1777 dwarn:1   dfail:0   fail:11  skip:1610 time:11835s
shard-hsw        total:3429 pass:1760 dwarn:1   dfail:0   fail:2   skip:1665 time:11550s
shard-snb        total:3429 pass:1350 dwarn:2   dfail:0   fail:1   skip:2076 time:6580s

Blacklisted hosts:
shard-kbl total:3429 pass:1911 dwarn:14 dfail:1 fail:9 skip:1494 time:9643s

== Logs ==

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