Commit 86a25121 authored Apr 02, 2014 by Jani Nikula Committed by Daniel Vetter Apr 02, 2014

drm/i915: fix command parser debug print format mismatches



Drop the cast from the pointer diff to fix:

drivers/gpu/drm/i915/i915_cmd_parser.c:405:4: warning: format '%td' expects
argument of type 'ptrdiff_t', but argument 5 has type 'long unsigned int'
[-Wformat]

While at it, use %u for u32.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
[danvet: After conflict resolution only the "While at it, ..." part
was left standing ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 6e66ea13

drivers/gpu/drm/i915/i915_cmd_parser.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -906,7 +906,7 @@ int i915_parse_cmds(struct intel_ring_buffer *ring,
		length = ((*cmd & desc->length.mask) + LENGTH_BIAS);

		if ((batch_end - cmd) < length) {
		DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%d batchlen=%td\n",
		DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%u batchlen=%td\n",
		*cmd,
		length,
		batch_end - cmd);