| @@ -2963,8 +2963,8 @@ static struct i915_vma * · 2962 unmodified lines |
| 2963 | i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, | 2963 | i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, |
| 2964 | struct i915_address_space *vm, | 2964 | struct i915_address_space *vm, |
| 2965 | const struct i915_ggtt_view *ggtt_view, | 2965 | const struct i915_ggtt_view *ggtt_view, |
| 2966 | unsigned alignment, | 2966 | u64 alignment, |
| 2967 | uint64_t flags) | 2967 | u64 flags) |
| 2968 | { | 2968 | { |
| 2969 | struct drm_device *dev = obj->base.dev; | 2969 | struct drm_device *dev = obj->base.dev; |
| 2970 | struct drm_i915_private *dev_priv = to_i915(dev); | 2970 | struct drm_i915_private *dev_priv = to_i915(dev); |
| @@ -3023,7 +3023,7 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, · 52 unmodified lines |
| 3023 | alignment = flags & PIN_MAPPABLE ? fence_alignment : | 3023 | alignment = flags & PIN_MAPPABLE ? fence_alignment : |
| 3024 | unfenced_alignment; | 3024 | unfenced_alignment; |
| 3025 | if (flags & PIN_MAPPABLE && alignment & (fence_alignment - 1)) { | 3025 | if (flags & PIN_MAPPABLE && alignment & (fence_alignment - 1)) { |
| 3026 | DRM_DEBUG("Invalid object (view type=%u) alignment requested %u\n", | 3026 | DRM_DEBUG("Invalid object (view type=%u) alignment requested %llx\n", |
| 3027 | ggtt_view ? ggtt_view->type : 0, | 3027 | ggtt_view ? ggtt_view->type : 0, |
| 3028 | alignment); | 3028 | alignment); |
| 3029 | return ERR_PTR(-EINVAL); | 3029 | return ERR_PTR(-EINVAL); |
| @@ -3678,7 +3678,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) · 648 unmodified lines |
| 3678 | } | 3678 | } |
| 3679 | | 3679 | |
| 3680 | static bool | 3680 | static bool |
| 3681 | i915_vma_misplaced(struct i915_vma *vma, uint32_t alignment, uint64_t flags) | 3681 | i915_vma_misplaced(struct i915_vma *vma, u64 alignment, u64 flags) |
| 3682 | { | 3682 | { |
| 3683 | struct drm_i915_gem_object *obj = vma->obj; | 3683 | struct drm_i915_gem_object *obj = vma->obj; |
| 3684 | | 3684 | |
| @@ -3727,8 +3727,8 @@ static int · 42 unmodified lines |
| 3727 | i915_gem_object_do_pin(struct drm_i915_gem_object *obj, | 3727 | i915_gem_object_do_pin(struct drm_i915_gem_object *obj, |
| 3728 | struct i915_address_space *vm, | 3728 | struct i915_address_space *vm, |
| 3729 | const struct i915_ggtt_view *ggtt_view, | 3729 | const struct i915_ggtt_view *ggtt_view, |
| 3730 | uint32_t alignment, | 3730 | u64 alignment, |
| 3731 | uint64_t flags) | 3731 | u64 flags) |
| 3732 | { | 3732 | { |
| 3733 | struct drm_i915_private *dev_priv = to_i915(obj->base.dev); | 3733 | struct drm_i915_private *dev_priv = to_i915(obj->base.dev); |
| 3734 | struct i915_vma *vma; | 3734 | struct i915_vma *vma; |
| @@ -3757,7 +3757,7 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, · 22 unmodified lines |
| 3757 | if (i915_vma_misplaced(vma, alignment, flags)) { | 3757 | if (i915_vma_misplaced(vma, alignment, flags)) { |
| 3758 | WARN(vma->pin_count, | 3758 | WARN(vma->pin_count, |
| 3759 | "bo is already pinned in %s with incorrect alignment:" | 3759 | "bo is already pinned in %s with incorrect alignment:" |
| 3760 | " offset=%08x %08x, req.alignment=%x, req.map_and_fenceable=%d," | 3760 | " offset=%08x %08x, req.alignment=%llx, req.map_and_fenceable=%d," |
| 3761 | " obj->map_and_fenceable=%d\n", | 3761 | " obj->map_and_fenceable=%d\n", |
| 3762 | ggtt_view ? "ggtt" : "ppgtt", | 3762 | ggtt_view ? "ggtt" : "ppgtt", |
| 3763 | upper_32_bits(vma->node.start), | 3763 | upper_32_bits(vma->node.start), |
| @@ -3798,8 +3798,8 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, · 34 unmodified lines |
| 3798 | int | 3798 | int |
| 3799 | i915_gem_object_pin(struct drm_i915_gem_object *obj, | 3799 | i915_gem_object_pin(struct drm_i915_gem_object *obj, |
| 3800 | struct i915_address_space *vm, | 3800 | struct i915_address_space *vm, |
| 3801 | uint32_t alignment, | 3801 | u64 alignment, |
| 3802 | uint64_t flags) | 3802 | u64 flags) |
| 3803 | { | 3803 | { |
| 3804 | return i915_gem_object_do_pin(obj, vm, | 3804 | return i915_gem_object_do_pin(obj, vm, |
| 3805 | i915_is_ggtt(vm) ? &i915_ggtt_view_normal : NULL, | 3805 | i915_is_ggtt(vm) ? &i915_ggtt_view_normal : NULL, |
| @@ -3809,8 +3809,8 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, · 3 unmodified lines |
| 3809 | int | 3809 | int |
| 3810 | i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, | 3810 | i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, |
| 3811 | const struct i915_ggtt_view *view, | 3811 | const struct i915_ggtt_view *view, |
| 3812 | uint32_t alignment, | 3812 | u64 alignment, |
| 3813 | uint64_t flags) | 3813 | u64 flags) |
| 3814 | { | 3814 | { |
| 3815 | struct drm_device *dev = obj->base.dev; | 3815 | struct drm_device *dev = obj->base.dev; |
| 3816 | struct drm_i915_private *dev_priv = to_i915(dev); | 3816 | struct drm_i915_private *dev_priv = to_i915(dev); |