Skip to contentSkip to conversation

lib/igt_core: Don't return too early in common_init_config

PATCH In review Petri Latvala 3 participants 7 messages Oct 26, 2020 – Nov 4, 2020 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/igt_core: Don't return too early in common_init_config

common_init_config is responsible for adding the device filters supplied through the environment to the filter list. If the .igtrc file cannot be opened, make sure the filter is added still.

Cc Arkadiusz Hiler <[email protected]>
---
 lib/igt_core.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
lib/igt_core.c +9 -9
index b358173f..8f9d925b 100644
@@ -775,21 +775,20 @@ GKeyFile *igt_load_igtrc(void)
 static void common_init_config(void)
 {
 	GError *error = NULL;
-	int ret;
+	int ret = 0;
 
 	igt_key_file = igt_load_igtrc();
-	if (!igt_key_file)
-		return;
 
-	if (!igt_frame_dump_path)
+	if (igt_key_file && !igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",
 					      "FrameDumpPath", &error);
 
 	g_clear_error(&error);
 
-	ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
-				     &error);
+	if (igt_key_file)
+		ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
+					     &error);
 	assert(!error || error->code != G_KEY_FILE_ERROR_INVALID_VALUE);
 
 	g_clear_error(&error);
@@ -804,9 +803,10 @@ static void common_init_config(void)
 		if (igt_rc_device) {
 			igt_debug("Notice: using IGT_DEVICE env:\n");
 		} else {
-			igt_rc_device =	g_key_file_get_string(igt_key_file,
-							      "Common",
-							      "Device", &error);
+			if (igt_key_file)
+				igt_rc_device =	g_key_file_get_string(igt_key_file,
+								      "Common",
+								      "Device", &error);
 			g_clear_error(&error);
 			if (igt_rc_device)
 				igt_debug("Notice: using .igtrc "
Signature · 6 lines
2.20.1

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

[igt-dev] ✓ Fi.CI.BAT: success for lib/igt_core: Don't return too early in common_init_config

== Series Details ==

== Series Details ==

Series: lib/igt_core: Don't return too early in common_init_config
URL : https://patchwork.freedesktop.org/series/83034/
State : success

== Summary ==

CI Bug Log - changes from IGT_5826 -> IGTPW_5097
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_module_load@reload:
- fi-tgl-u2: [PASS][1] -> [DMESG-WARN][2] ([i915#1982] / [k.org#205379])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-tgl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-tgl-u2/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-byt-j1900: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-byt-j1900/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-byt-j1900/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_create@basic-files:
- fi-apl-guc: [INCOMPLETE][5] ([i915#1635]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-apl-guc/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-apl-guc/igt@[email protected]

* igt@i915_selftest@live@active:
- fi-bsw-kefka: [DMESG-FAIL][7] -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-bsw-kefka/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-bsw-kefka/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: [DMESG-FAIL][9] ([i915#541]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html

* igt@vgem_basic@unload:
- fi-skl-guc: [DMESG-WARN][11] ([i915#2203]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/fi-skl-guc/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/fi-skl-guc/igt@[email protected]

[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379

Participating hosts (45 -> 39)
------------------------------

Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus

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

* CI: CI-20190529 -> None
* IGT: IGT_5826 -> IGTPW_5097

CI-20190529: 20190529
CI_DRM_9193: 92d57a5d951e06303a37f344f179d010753db622 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5097: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html
IGT_5826: a627439eb5e39d927306055b1e540ef5940d7396 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html

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

#2 lore raw

[igt-dev] ✗ Fi.CI.IGT: failure for lib/igt_core: Don't return too early in common_init_config

In reply to Petri Latvala
== Series Details ==

== Series Details ==

Series: lib/igt_core: Don't return too early in common_init_config
URL : https://patchwork.freedesktop.org/series/83034/
State : failure

== Summary ==

CI Bug Log - changes from IGT_5826_full -> IGTPW_5097_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_5097_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_5097_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_5097_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_cursor_legacy@all-pipes-forked-bo:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb1/igt@kms_flip@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb1/igt@kms_flip@[email protected]

#### Warnings ####

* igt@kms_content_protection@uevent:
- shard-kbl: [FAIL][5] ([i915#2105]) -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-kbl1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-kbl4/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [PASS][7] -> [DMESG-WARN][8] ([i915#118] / [i915#95])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk1/igt@[email protected]

* igt@kms_atomic_interruptible@universal-setplane-primary:
- shard-snb: [PASS][9] -> [SKIP][10] ([fdo#109271])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb4/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb2/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][11] -> [INCOMPLETE][12] ([i915#155])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-kbl2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-kbl2/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][13] -> [FAIL][14] ([i915#79]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk5/igt@kms_flip@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk6/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-cpu:
- shard-snb: [PASS][15] -> [FAIL][16] ([i915#2546])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb7/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
- shard-tglb: [PASS][17] -> [DMESG-WARN][18] ([i915#1982]) +4 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb2/igt@[email protected]

* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-iclb8/igt@kms_psr@psr2_primary_mmap_gtt.html

#### Possible fixes ####

* igt@gem_eio@in-flight-10ms:
- shard-hsw: [TIMEOUT][21] -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-hsw1/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-hsw4/igt@[email protected]

* igt@gem_exec_gttfill@engines@rcs0:
- shard-glk: [DMESG-WARN][23] ([i915#118] / [i915#95]) -> [PASS][24] +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk7/igt@gem_exec_gttfill@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk3/igt@gem_exec_gttfill@[email protected]

* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][25] ([i915#2389]) -> [PASS][26] +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk1/igt@gem_exec_reloc@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk1/igt@gem_exec_reloc@[email protected]

* igt@gem_exec_schedule@preemptive-hang@bcs0:
- shard-tglb: [INCOMPLETE][27] -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb7/igt@gem_exec_schedule@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb1/igt@gem_exec_schedule@[email protected]

* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][29] ([i915#644]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk8/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk5/igt@[email protected]

* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-hsw: [FAIL][31] ([i915#1888]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-hsw6/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-hsw2/igt@[email protected]

* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-snb: [INCOMPLETE][33] ([i915#82]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb5/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][35] ([i915#454]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-iclb6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-iclb3/igt@[email protected]

* {igt@kms_async_flips@alternate-sync-async-flip}:
- shard-glk: [FAIL][37] ([i915#2521]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk2/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-128x128-sliding:
- shard-kbl: [FAIL][39] ([i915#54]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-kbl7/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-kbl2/igt@[email protected]
- shard-apl: [FAIL][41] ([i915#1635] / [i915#54]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-apl7/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-apl2/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy:
- shard-snb: [FAIL][43] -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb6/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb4/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic:
- shard-kbl: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-kbl4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-kbl1/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-glk: [FAIL][47] ([i915#2346]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk8/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk4/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb8888-blt-untiled:
- shard-snb: [FAIL][49] ([i915#54]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb5/igt@[email protected]

* igt@kms_flip@2x-dpms-vs-vblank-race-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][51] ([i915#407]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk7/igt@kms_flip@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk9/igt@kms_flip@[email protected]

* igt@kms_flip@2x-flip-vs-panning-vs-hang@ab-hdmi-a1-hdmi-a2:
- shard-glk: [DMESG-WARN][53] ([i915#1982]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk1/igt@kms_flip@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk8/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
- shard-glk: [FAIL][55] ([i915#79]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk2/igt@kms_flip@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk9/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-farfromfence:
- shard-snb: [FAIL][57] ([i915#2546]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-snb4/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-snb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-tiling-y:
- shard-tglb: [DMESG-WARN][59] ([i915#1982]) -> [PASS][60] +2 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb7/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb2/igt@[email protected]

* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][61] ([fdo#109441]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_gtt.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html

* igt@perf@invalid-create-userspace-config:
- shard-kbl: [SKIP][63] ([fdo#109271] / [i915#1354]) -> [PASS][64] +3 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-kbl4/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-kbl2/igt@[email protected]

* igt@perf@invalid-oa-exponent:
- shard-hsw: [SKIP][65] ([fdo#109271]) -> [PASS][66] +3 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-hsw6/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-hsw1/igt@[email protected]
- shard-iclb: [SKIP][67] ([i915#1354]) -> [PASS][68] +3 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-iclb1/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-iclb6/igt@[email protected]

* igt@perf@polling-small-buf:
- shard-glk: [SKIP][69] ([fdo#109271] / [i915#1354]) -> [PASS][70] +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-glk4/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-glk5/igt@[email protected]
- shard-tglb: [SKIP][71] ([i915#1354]) -> [PASS][72] +3 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-tglb2/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-tglb1/igt@[email protected]
- shard-apl: [SKIP][73] ([fdo#109271] / [i915#1354] / [i915#1635]) -> [PASS][74] +3 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-apl8/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-apl7/igt@[email protected]

* igt@syncobj_timeline@invalid-query-one-illegal-handle:
- shard-apl: [DMESG-WARN][75] ([i915#1635] / [i915#1982]) -> [PASS][76] +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-apl1/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-apl1/igt@[email protected]

#### Warnings ####

* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-apl: [FAIL][77] ([fdo#108145] / [i915#1635] / [i915#265]) -> [DMESG-FAIL][78] ([fdo#108145] / [i915#1635] / [i915#1982])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5826/shard-apl7/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/shard-apl8/igt@[email protected]

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

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1354]: https://gitlab.freedesktop.org/drm/intel/issues/1354
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2105]: https://gitlab.freedesktop.org/drm/intel/issues/2105
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546
[i915#2559]: https://gitlab.freedesktop.org/drm/intel/issues/2559
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#407]: https://gitlab.freedesktop.org/drm/intel/issues/407
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (8 -> 8)
------------------------------

No changes in participating hosts

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

* CI: CI-20190529 -> None
* IGT: IGT_5826 -> IGTPW_5097

CI-20190529: 20190529
CI_DRM_9193: 92d57a5d951e06303a37f344f179d010753db622 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5097: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html
IGT_5826: a627439eb5e39d927306055b1e540ef5940d7396 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5097/index.html

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

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

common_init_config is responsible for adding the device filters supplied through the environment to the filter list. If the .igtrc file cannot be opened, make sure the filter is added still.

Cc Arkadiusz Hiler <[email protected]>
---
 lib/igt_core.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
lib/igt_core.c +0 -0
index b358173f..8f9d925b 100644

lib/igt_core.c GKeyFile *igt_load_igtrc(void) · line 782

Quoted 9 lines
lib/igt_core.c +1 -3
@@ -775,21 +775,20 @@ GKeyFile *igt_load_igtrc(void)
 static void common_init_config(void)
 {
 	GError *error = NULL;
-	int ret;
+	int ret = 0;
 
 	igt_key_file = igt_load_igtrc();
-	if (!igt_key_file)
-		return;

I believe the only change needed is the one above. The remaining igt_key_file checks below are not needed because it looks like if we pass NULL igt_key_file g_key_file_get_string will return NULL and g_key_file_get_integer will return 0 (that is previously initialized values are undisturbed).

At the link below it is not clearly stated what happens when GKeyFile is NULL so I am mostly inferring from the way it is handling other error cases, so if we want to do this we'll probably need to test it out:

https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html

Otherwise the patch is fine:

Quoted 20 lines
lib/igt_core.c +4 -3
-	if (!igt_frame_dump_path)
+	if (igt_key_file && !igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",
 					      "FrameDumpPath", &error);
 
 	g_clear_error(&error);
 
-	ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
-				     &error);
+	if (igt_key_file)
+		ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
+					     &error);
 	assert(!error || error->code != G_KEY_FILE_ERROR_INVALID_VALUE);
 
 	g_clear_error(&error);
@@ -804,9 +803,10 @@ static void common_init_config(void)
 		if (igt_rc_device) {
 			igt_debug("Notice: using IGT_DEVICE env:\n");
 		} else {

lib/igt_core.c static void common_init_config(void) · line 812

Quoted 10 lines
lib/igt_core.c +4 -3
-			igt_rc_device =	g_key_file_get_string(igt_key_file,
-							      "Common",
-							      "Device", &error);
+			if (igt_key_file)
+				igt_rc_device =	g_key_file_get_string(igt_key_file,
+								      "Common",
+								      "Device", &error);
 			g_clear_error(&error);
 			if (igt_rc_device)
 				igt_debug("Notice: using .igtrc "

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

#4 lore raw
Quoted 33 lines · Ashutosh
Quoted 16 lines · Petri Latvala

common_init_config is responsible for adding the device filters supplied through the environment to the filter list. If the .igtrc file cannot be opened, make sure the filter is added still.

Cc Arkadiusz Hiler <[email protected]>
---
 lib/igt_core.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
lib/igt_core.c +0 -0
index b358173f..8f9d925b 100644

lib/igt_core.c GKeyFile *igt_load_igtrc(void) · line 782

Quoted 9 lines
lib/igt_core.c +1 -3
@@ -775,21 +775,20 @@ GKeyFile *igt_load_igtrc(void)
 static void common_init_config(void)
 {
 	GError *error = NULL;
-	int ret;
+	int ret = 0;
 
 	igt_key_file = igt_load_igtrc();
-	if (!igt_key_file)
-		return;

I believe the only change needed is the one above. The remaining igt_key_file checks below are not needed because it looks like if we pass NULL igt_key_file g_key_file_get_string will return NULL and g_key_file_get_integer will return 0 (that is previously initialized values are undisturbed).

Quoted 3 lines

At the link below it is not clearly stated what happens when GKeyFile is NULL so I am mostly inferring from the way it is handling other error cases, so if we want to do this we'll probably need to test it out:

If it's not documented to work that way, I'm wary of calling those functions with NULL. It could behave differently in different versions of glib.

Signature · 1 line
Petri Latvala
Quoted 23 lines

https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html

Otherwise the patch is fine:

Quoted 15 lines
lib/igt_core.c +4 -3
-	if (!igt_frame_dump_path)
+	if (igt_key_file && !igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",
 					      "FrameDumpPath", &error);
 
 	g_clear_error(&error);
 
-	ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
-				     &error);
+	if (igt_key_file)
+		ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
+					     &error);
 	assert(!error || error->code != G_KEY_FILE_ERROR_INVALID_VALUE);
 
Quoted 15 lines
Quoted 5 lines
lib/igt_core.c +0 -0
 	g_clear_error(&error);
@@ -804,9 +803,10 @@ static void common_init_config(void)
 		if (igt_rc_device) {
 			igt_debug("Notice: using IGT_DEVICE env:\n");
 		} else {

lib/igt_core.c static void common_init_config(void) · line 812

Quoted 10 lines
lib/igt_core.c +4 -3
-			igt_rc_device =	g_key_file_get_string(igt_key_file,
-							      "Common",
-							      "Device", &error);
+			if (igt_key_file)
+				igt_rc_device =	g_key_file_get_string(igt_key_file,
+								      "Common",
+								      "Device", &error);
 			g_clear_error(&error);
 			if (igt_rc_device)
 				igt_debug("Notice: using .igtrc "

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

Reviewed-by
#5 lore raw
Quoted 35 lines · Petri Latvala
Quoted 33 lines · Ashutosh
Quoted 16 lines · Petri Latvala

common_init_config is responsible for adding the device filters supplied through the environment to the filter list. If the .igtrc file cannot be opened, make sure the filter is added still.

Cc Arkadiusz Hiler <[email protected]>
---
 lib/igt_core.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
lib/igt_core.c +0 -0
index b358173f..8f9d925b 100644

lib/igt_core.c GKeyFile *igt_load_igtrc(void) · line 782

Quoted 9 lines
lib/igt_core.c +1 -3
@@ -775,21 +775,20 @@ GKeyFile *igt_load_igtrc(void)
 static void common_init_config(void)
 {
 	GError *error = NULL;
-	int ret;
+	int ret = 0;
 
 	igt_key_file = igt_load_igtrc();
-	if (!igt_key_file)
-		return;

I believe the only change needed is the one above. The remaining igt_key_file checks below are not needed because it looks like if we pass NULL igt_key_file g_key_file_get_string will return NULL and g_key_file_get_integer will return 0 (that is previously initialized values are undisturbed).

Quoted 7 lines
Quoted 3 lines

At the link below it is not clearly stated what happens when GKeyFile is NULL so I am mostly inferring from the way it is handling other error cases, so if we want to do this we'll probably need to test it out:

If it's not documented to work that way, I'm wary of calling those functions with NULL. It could behave differently in different versions of glib.

OK, once again:

Quoted 23 lines
Quoted 23 lines

https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html

Otherwise the patch is fine:

Quoted 15 lines
lib/igt_core.c +4 -3
-	if (!igt_frame_dump_path)
+	if (igt_key_file && !igt_frame_dump_path)
 		igt_frame_dump_path =
 			g_key_file_get_string(igt_key_file, "Common",
 					      "FrameDumpPath", &error);
 
 	g_clear_error(&error);
 
-	ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
-				     &error);
+	if (igt_key_file)
+		ret = g_key_file_get_integer(igt_key_file, "DUT", "SuspendResumeDelay",
+					     &error);
 	assert(!error || error->code != G_KEY_FILE_ERROR_INVALID_VALUE);
 
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
lib/igt_core.c +0 -2
 	g_clear_error(&error);
@@ -804,9 +803,10 @@ static void common_init_config(void)
 		if (igt_rc_device) {
 			igt_debug("Notice: using IGT_DEVICE env:\n");
 		} else {
-			igt_rc_device =	g_key_file_get_string(igt_key_file,
-							      "Common",
Quoted 8 lines

lib/igt_core.c static void common_init_config(void) · line 812

Quoted 8 lines
lib/igt_core.c +4 -1
-							      "Device", &error);
+			if (igt_key_file)
+				igt_rc_device =	g_key_file_get_string(igt_key_file,
+								      "Common",
+								      "Device", &error);
 			g_clear_error(&error);
 			if (igt_rc_device)
 				igt_debug("Notice: using .igtrc "

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

#6 lore raw
Quoted 40 lines · Ashutosh
Quoted 39 lines · Petri Latvala
Quoted 36 lines · Ashutosh
Quoted 16 lines · Petri Latvala

common_init_config is responsible for adding the device filters supplied through the environment to the filter list. If the .igtrc file cannot be opened, make sure the filter is added still.

Cc Arkadiusz Hiler <[email protected]>
---
 lib/igt_core.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
lib/igt_core.c +0 -0
index b358173f..8f9d925b 100644

lib/igt_core.c GKeyFile *igt_load_igtrc(void) · line 782

Quoted 9 lines
lib/igt_core.c +1 -3
@@ -775,21 +775,20 @@ GKeyFile *igt_load_igtrc(void)
 static void common_init_config(void)
 {
 	GError *error = NULL;
-	int ret;
+	int ret = 0;
 
 	igt_key_file = igt_load_igtrc();
-	if (!igt_key_file)
-		return;

I believe the only change needed is the one above. The remaining igt_key_file checks below are not needed because it looks like if we pass NULL igt_key_file g_key_file_get_string will return NULL and g_key_file_get_integer will return 0 (that is previously initialized values are undisturbed).

At the link below it is not clearly stated what happens when GKeyFile is NULL so I am mostly inferring from the way it is handling other error cases, so if we want to do this we'll probably need to test it out:

Quoted 7 lines
Quoted 3 lines

If it's not documented to work that way, I'm wary of calling those functions with NULL. It could behave differently in different versions of glib.

OK, once again:

Thanks, merged.

Signature · 5 lines
Petri Latvala
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev