Skip to contentSkip to conversation

Fix compiler warnings about printf() arguments

PATCH In review [email protected] 3 participants 7 messages Sep 7, 2017 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 Fix compiler warnings about printf() arguments

From: Ville Syrjälä <[email protected]>

gem_spin_batch.c:51:13: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘long unsigned int’ [-Wformat=] intel_opregion_decode.c:313:9: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘uint64_t {aka const long long unsigned int}’ [-Wformat=]

---
 tests/gem_spin_batch.c        | 2 +-
 tools/intel_opregion_decode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tests/gem_spin_batch.c +1 -1
index 941aa1399ae1..09bb3cb37108 100644
@@ -48,7 +48,7 @@ static void spin(int fd, unsigned int engine, unsigned int timeout_sec)
 		igt_spin_batch_set_timeout(spin,
 					   timeout_100ms - igt_nsec_elapsed(&itv));
 		gem_sync(fd, spin->handle);
-		igt_debug("loop %d: interval=%fms (target 100ms), elapsed %fms\n",
+		igt_debug("loop %lu: interval=%fms (target 100ms), elapsed %fms\n",
 			  loops,
 			  igt_nsec_elapsed(&itv) * 1e-6,
 			  igt_nsec_elapsed(&tv) * 1e-6);
tools/intel_opregion_decode.c +1 -1
index f532c1e2952b..380e43a8b514 100644
@@ -310,7 +310,7 @@ static void decode_asle(const void *buffer)
 
 	printf("\tfdsp:\t0x%08x\n", asle->fdsp);
 	printf("\tstat:\t0x%08x\n", asle->stat);
-	printf("\trvda:\t0x%016lx\n", asle->rvda);
+	printf("\trvda:\t0x%016"PRIx64"\n", asle->rvda);
 	printf("\trvds:\t0x%08x\n", asle->rvds);
 
 	printf("\n");
Signature · 6 lines
2.13.5

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

PATCH 2/5 lib/kms: Fix the connector name strings to match what the kernel uses

From: Ville Syrjälä <[email protected]>

We depend on kmstest_connector_type_str() matching the kernel. Fix up the cases where we differ currently. Also add the missing DPI "connector" type.

---
 lib/igt_aux.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
lib/igt_aux.c +6 -5
index d808fe3ed27a..ba6d669591d6 100644
@@ -1096,16 +1096,16 @@ const char *kmstest_connector_status_str(int status)
 }
 
 static const struct type_name connector_type_names[] = {
-	{ DRM_MODE_CONNECTOR_Unknown, "unknown" },
+	{ DRM_MODE_CONNECTOR_Unknown, "Unknown" },
 	{ DRM_MODE_CONNECTOR_VGA, "VGA" },
 	{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
 	{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
 	{ DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
-	{ DRM_MODE_CONNECTOR_Composite, "composite" },
-	{ DRM_MODE_CONNECTOR_SVIDEO, "s-video" },
+	{ DRM_MODE_CONNECTOR_Composite, "Composite" },
+	{ DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO" },
 	{ DRM_MODE_CONNECTOR_LVDS, "LVDS" },
-	{ DRM_MODE_CONNECTOR_Component, "component" },
-	{ DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN" },
+	{ DRM_MODE_CONNECTOR_Component, "Component" },
+	{ DRM_MODE_CONNECTOR_9PinDIN, "DIN" },
 	{ DRM_MODE_CONNECTOR_DisplayPort, "DP" },
 	{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
 	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
@@ -1113,6 +1113,7 @@ static const struct type_name connector_type_names[] = {
 	{ DRM_MODE_CONNECTOR_eDP, "eDP" },
 	{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
 	{ DRM_MODE_CONNECTOR_DSI, "DSI" },
+	{ DRM_MODE_CONNECTOR_DPI, "DPI" },
 	{}
 };
 
Signature · 6 lines
2.13.5

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

PATCH 3/5 lib/kms: Skip rather than fail when a suitable plane can't be found

In reply to [email protected]

From: Ville Syrjälä <[email protected]>

If the system doesn't have the plane the test wants, let's skip the test rather than fail it.

---
 lib/igt_kms.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/igt_kms.c +3 -3
index 14e2701c3afd..72fde792ba89 100644
@@ -2035,9 +2035,9 @@ igt_plane_t *igt_pipe_get_plane_type(igt_pipe_t *pipe, int plane_type)
 		break;
 	}
 
-	igt_assert_f(plane_idx >= 0 && plane_idx < pipe->n_planes,
-		"Valid pipe->planes idx not found. plane_idx=%d plane_type=%d n_planes=%d\n",
-		plane_idx, plane_type, pipe->n_planes);
+	igt_require_f(plane_idx >= 0 && plane_idx < pipe->n_planes,
+		      "Valid pipe->planes idx not found. plane_idx=%d plane_type=%d n_planes=%d\n",
+		      plane_idx, plane_type, pipe->n_planes);
 
 	return &pipe->planes[plane_idx];
 }
Signature · 6 lines
2.13.5

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

PATCH 4/5 tests/kms_draw_crc: Skip mmap_wc tests if the platforms doesn't support mmap_wc

In reply to [email protected]

From: Ville Syrjälä <[email protected]>

---
 tests/kms_draw_crc.c | 2 ++
 1 file changed, 2 insertions(+)
tests/kms_draw_crc.c +2 -0
index 906d89f9b77d..260950c76e00 100644
@@ -161,6 +161,8 @@ static void draw_method_subtest(enum igt_draw_method method,
 	if (tiling == LOCAL_I915_FORMAT_MOD_Y_TILED)
 		igt_require(intel_gen(intel_get_drm_devid(drm_fd)) >= 9);
 
+	igt_skip_on(method == IGT_DRAW_MMAP_WC && !gem_mmap__has_wc(drm_fd));
+
 	/* Use IGT_DRAW_MMAP_GTT on an untiled buffer as the parameter for
 	 * comparison. Cache the value so we don't recompute it for every single
 	 * subtest. */
Signature · 6 lines
2.13.5

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

PATCH 5/5 tests/kms_properties: Require atomic for the atomic invalid props test

In reply to [email protected]

From: Ville Syrjälä <[email protected]>

The invalid props test forgot to check for atomic. Add the required check.

---
 tests/kms_properties.c | 3 +++
 1 file changed, 3 insertions(+)
tests/kms_properties.c +3 -0
index 544a80097c54..a63b69b4decf 100644
@@ -389,6 +389,9 @@ static void invalid_properties(igt_display_t *display, bool atomic)
 	enum pipe pipe;
 	int i;
 
+	if (atomic)
+		igt_skip_on(!display->is_atomic);
+
 	for_each_pipe(display, pipe)
 		test_object_invalid_properties(display, display->pipes[pipe].crtc_id, DRM_MODE_OBJECT_CRTC, atomic);
 
Signature · 6 lines
2.13.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 5/5
#5 lore raw

Re: [PATCH i-g-t 5/5] tests/kms_properties: Require atomic for the atomic invalid props test

Quoting [email protected] (2017-09-07 17:11:20)

Quoted 6 lines

From: Ville Syrjälä <[email protected]>

The invalid props test forgot to check for atomic. Add the required check.

Series is

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

#6 lore raw

✗ Fi.CI.BAT: warning for series starting with [1/5] Fix compiler warnings about printf() arguments

In reply to [email protected]
== Series Details ==

== Series Details ==

Series: series starting with [1/5] Fix compiler warnings about printf() arguments
URL : https://patchwork.freedesktop.org/series/29961/
State : warning

== Summary ==

IGT patchset tested on top of latest successful build 4a1c8daff2005e2cbfe980d63bc0a0fb09cb017d igt/gem_ringfill: Prime execbuf before measuring ring size

with latest DRM-Tip kernel build CI_DRM_3055
9d8ff561fb22 drm-tip: 2017y-09m-07d-15h-07m-16s UTC integration manifest

Test kms_cursor_legacy:

        Subgroup basic-busy-flip-before-cursor-atomic:
                fail       -> PASS       (fi-snb-2600) fdo#100215 +1
        Subgroup basic-flip-before-cursor-varying-size:
                pass       -> DMESG-WARN (fi-glk-2a)
Test kms_flip:
        Subgroup basic-flip-vs-modeset:
                pass       -> SKIP       (fi-cfl-s)
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> SKIP       (fi-cfl-s)

fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:460s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:450s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:360s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:567s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:254s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:523s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:528s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:527s
fi-cfl-s         total:289  pass:248  dwarn:4   dfail:0   fail:0   skip:37  time:436s
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:448s
fi-glk-2a        total:289  pass:259  dwarn:1   dfail:0   fail:0   skip:29  time:619s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:450s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:425s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:434s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:506s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:475s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:518s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:598s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:602s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:524s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:473s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:537s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:520s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:448s
fi-skl-x1585l    total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:500s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:563s
fi-snb-2600      total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:412s

== Logs ==

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