On Thu, May 1, 2014 at 1:26 AM, Dave Airlie <airlied at gmail.com> wrote: > > Merged, but 32-bit still a thing, > > CC [M] drivers/gpu/drm/i915/i915_cmd_parser.o > /ssd/git/drm-next/drivers/gpu/drm/i915/i915_cmd_parser.c: In function > ?i915_parse_cmds?: > /ssd/git/drm-next/drivers/gpu/drm/i915/i915_cmd_parser.c:919:4: > warning: format ?%td? expects argument of type ?ptrdiff_t?, but > argument 5 has type ?long unsigned int? [-Wformat=] > DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X > length=%u batchlen=%td\n", > ^
Oops, sorry about this. I've made a pretty decent mess here by applying two competing patches to fix the issue ;-) My -next queue has the revert for one again already, so should be addressed with the next pull request: commit dcfce6cafbb1e2afb16792f2834d9924924c2228 Author: Jan Moskyto Matejka <mq at suse.cz> Date: Mon Apr 28 15:03:23 2014 +0200 Revert "drm/i915: fix build warning on 32-bit (v2)" Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch