diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 6ccdf954b1ca..970714bb77a2 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -2795,19 +2795,19 @@ void i915_gem_restore_fences(struct drm_device *dev); | |||
2795 | 2795 | ||
2796 | unsigned long | 2796 | unsigned long |
2797 | i915_gem_obj_ggtt_offset_view(struct drm_i915_gem_object *o, | 2797 | i915_gem_obj_ggtt_offset_view(struct drm_i915_gem_object *o, |
2798 | enum i915_ggtt_view_type view); | 2798 | const struct i915_ggtt_view *view); |
2799 | unsigned long | 2799 | unsigned long |
2800 | i915_gem_obj_offset(struct drm_i915_gem_object *o, | 2800 | i915_gem_obj_offset(struct drm_i915_gem_object *o, |
2801 | struct i915_address_space *vm); | 2801 | struct i915_address_space *vm); |
2802 | static inline unsigned long | 2802 | static inline unsigned long |
2803 | i915_gem_obj_ggtt_offset(struct drm_i915_gem_object *o) | 2803 | i915_gem_obj_ggtt_offset(struct drm_i915_gem_object *o) |
2804 | { | 2804 | { |
2805 | return i915_gem_obj_ggtt_offset_view(o, I915_GGTT_VIEW_NORMAL); | 2805 | return i915_gem_obj_ggtt_offset_view(o, &i915_ggtt_view_normal); |
2806 | } | 2806 | } |
2807 | 2807 | ||
2808 | bool i915_gem_obj_bound_any(struct drm_i915_gem_object *o); | 2808 | bool i915_gem_obj_bound_any(struct drm_i915_gem_object *o); |
2809 | bool i915_gem_obj_ggtt_bound_view(struct drm_i915_gem_object *o, | 2809 | bool i915_gem_obj_ggtt_bound_view(struct drm_i915_gem_object *o, |
2810 | enum i915_ggtt_view_type view); | 2810 | const struct i915_ggtt_view *view); |
2811 | bool i915_gem_obj_bound(struct drm_i915_gem_object *o, | 2811 | bool i915_gem_obj_bound(struct drm_i915_gem_object *o, |
2812 | struct i915_address_space *vm); | 2812 | struct i915_address_space *vm); |
2813 | 2813 | ||
@@ -2855,7 +2855,7 @@ i915_vm_to_ppgtt(struct i915_address_space *vm) | |||
2855 | 2855 | ||
2856 | static inline bool i915_gem_obj_ggtt_bound(struct drm_i915_gem_object *obj) | 2856 | static inline bool i915_gem_obj_ggtt_bound(struct drm_i915_gem_object *obj) |
2857 | { | 2857 | { |
2858 | return i915_gem_obj_ggtt_bound_view(obj, I915_GGTT_VIEW_NORMAL); | 2858 | return i915_gem_obj_ggtt_bound_view(obj, &i915_ggtt_view_normal); |
2859 | } | 2859 | } |
2860 | 2860 | ||
2861 | static inline unsigned long | 2861 | static inline unsigned long |