diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2014-04-02 11:24:20 +0300 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-02 11:38:42 +0200 |
| commit | 86a2512124c1734c66bf240fac52a2af08aa1c6f (patch) | |
| tree | 862cfaa98689c4a4cb5c0cbcaa09a34df1056d6e /drivers/gpu/drm/i915/i915_cmd_parser.c | |
| parent | drm/i915: Track OACONTROL register enable/disable during parsing (diff) | |
| download | linux-dev-86a2512124c1734c66bf240fac52a2af08aa1c6f.tar.xz linux-dev-86a2512124c1734c66bf240fac52a2af08aa1c6f.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_cmd_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index 5b45c191c4e7..be09e7cd5afb 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -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); |