drm/i915: fix command parser debug print format mismatches
authorJani Nikula <jani.nikula@intel.com>
Wed, 2 Apr 2014 08:24:20 +0000 (11:24 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 2 Apr 2014 09:38:42 +0000 (11:38 +0200)
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>
drivers/gpu/drm/i915/i915_cmd_parser.c

index 5b45c191c4e7d10e76b07d90754a93e34f35be9d..be09e7cd5afb5de4dba9869a2e3d4ef2dc0b2744 100644 (file)
@@ -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);