On ke, 2016-07-27 at 12:14 +0100, Chris Wilson wrote:
> @@ -3029,9 +3029,9 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object
> *obj,
> alignment = flags & PIN_MAPPABLE ? fence_alignment :
> unfenced_alignment;
> if (flags & PIN_MAPPABLE && alignment & (fence_alignment - 1)) {
> - DRM_DEBUG("Invalid object (view type=%u) alignment requested
> %u\n",
> + DRM_DEBUG("Invalid object (view type=%u) alignment requested
> %llx\n",
> ggtt_view ? ggtt_view->type : 0,
> - alignment);
> + (long long)alignment);
From printk-formats;
u64 %llu or %llx
Should be no need to cast.
> return ERR_PTR(-EINVAL);
> }
>
> @@ -3688,7 +3688,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct
> drm_file *file)
> }
>
> static bool
> -i915_vma_misplaced(struct i915_vma *vma, uint32_t alignment, uint64_t flags)
> +i915_vma_misplaced(struct i915_vma *vma, u64 alignment, u64 flags)
> {
> struct drm_i915_gem_object *obj = vma->obj;
>
> @@ -3737,8 +3737,8 @@ static int
> i915_gem_object_do_pin(struct drm_i915_gem_object *obj,
> struct i915_address_space *vm,
> const struct i915_ggtt_view *ggtt_view,
> - uint32_t alignment,
> - uint64_t flags)
> + u64 alignment,
> + u64 flags)
> {
> struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
> struct i915_vma *vma;
> @@ -3767,12 +3767,12 @@ i915_gem_object_do_pin(struct drm_i915_gem_object
> *obj,
> if (i915_vma_misplaced(vma, alignment, flags)) {
> WARN(vma->pin_count,
> "bo is already pinned in %s with incorrect
> alignment:"
> - " offset=%08x %08x, req.alignment=%x,
> req.map_and_fenceable=%d,"
> + " offset=%08x %08x, req.alignment=%llx,
> req.map_and_fenceable=%d,"
> " obj->map_and_fenceable=%d\n",
> ggtt_view ? "ggtt" : "ppgtt",
> upper_32_bits(vma->node.start),
> lower_32_bits(vma->node.start),
> - alignment,
> + (long long)alignment,
Ditto here, or do you get warnings from GCC?
Otherwise seems fine, just converting the types to be wider.
Reviewed-by: Joonas Lahtinen <[email protected]>
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
