| Message ID | 20180709130208.11730-8-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris Wilson <chris@chris-wilson.co.uk> writes: > Since we have a header file for i915_gem_fence_reg, let's use it for the > interface prototypes currently hidden away in the huge i915_drv.h > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 15 --------------- > drivers/gpu/drm/i915/i915_gem_fence_reg.h | 16 ++++++++++++++++ > drivers/gpu/drm/i915/i915_vma.h | 2 +- > 3 files changed, 17 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index f05a0b7e4baf..ea2de36540da 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -70,7 +70,6 @@ > > #include "i915_gem.h" > #include "i915_gem_context.h" > -#include "i915_gem_fence_reg.h" > #include "i915_gem_object.h" > #include "i915_gem_gtt.h" > #include "i915_gpu_error.h" > @@ -3193,20 +3192,6 @@ i915_vm_to_ppgtt(struct i915_address_space *vm) > return container_of(vm, struct i915_hw_ppgtt, vm); > } > > -/* i915_gem_fence_reg.c */ > -struct drm_i915_fence_reg * > -i915_reserve_fence(struct drm_i915_private *dev_priv); > -void i915_unreserve_fence(struct drm_i915_fence_reg *fence); > - > -void i915_gem_revoke_fences(struct drm_i915_private *dev_priv); > -void i915_gem_restore_fences(struct drm_i915_private *dev_priv); > - > -void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv); > -void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, > - struct sg_table *pages); > -void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, > - struct sg_table *pages); > - > static inline struct i915_gem_context * > __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) > { > diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.h b/drivers/gpu/drm/i915/i915_gem_fence_reg.h > index c8f1d0cdfa90..c510f8efc1bb 100644 > --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.h > +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.h > @@ -27,7 +27,10 @@ > > #include <linux/list.h> > > +struct sg_table; > + > struct drm_i915_private; > +struct drm_i915_gem_object; > struct i915_ggtt; > struct i915_vma; > > @@ -55,4 +58,17 @@ struct drm_i915_fence_reg { > > void i915_ggtt_init_fences(struct i915_ggtt *ggtt); > > +struct drm_i915_fence_reg * > +i915_reserve_fence(struct drm_i915_private *i915); > +void i915_unreserve_fence(struct drm_i915_fence_reg *fence); > + > +void i915_gem_revoke_fences(struct drm_i915_private *i915); > +void i915_gem_restore_fences(struct drm_i915_private *i915); > + > +void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *i915); > +void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, > + struct sg_table *pages); > +void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, > + struct sg_table *pages); > + > #endif > diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h > index 422d90c686b5..925af79cc6d6 100644 > --- a/drivers/gpu/drm/i915/i915_vma.h > +++ b/drivers/gpu/drm/i915/i915_vma.h > @@ -31,12 +31,12 @@ > #include <drm/drm_mm.h> > > #include "i915_gem_gtt.h" > -#include "i915_gem_fence_reg.h" > #include "i915_gem_object.h" > > #include "i915_request.h" > > enum i915_cache_level; > +struct drm_i915_fence_reg; > > /** > * A VMA represents a GEM BO that is bound into an address space. Therefore, a > -- > 2.18.0
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f05a0b7e4baf..ea2de36540da 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -70,7 +70,6 @@ #include "i915_gem.h" #include "i915_gem_context.h" -#include "i915_gem_fence_reg.h" #include "i915_gem_object.h" #include "i915_gem_gtt.h" #include "i915_gpu_error.h" @@ -3193,20 +3192,6 @@ i915_vm_to_ppgtt(struct i915_address_space *vm) return container_of(vm, struct i915_hw_ppgtt, vm); } -/* i915_gem_fence_reg.c */ -struct drm_i915_fence_reg * -i915_reserve_fence(struct drm_i915_private *dev_priv); -void i915_unreserve_fence(struct drm_i915_fence_reg *fence); - -void i915_gem_revoke_fences(struct drm_i915_private *dev_priv); -void i915_gem_restore_fences(struct drm_i915_private *dev_priv); - -void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv); -void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, - struct sg_table *pages); -void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, - struct sg_table *pages); - static inline struct i915_gem_context * __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) { diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.h b/drivers/gpu/drm/i915/i915_gem_fence_reg.h index c8f1d0cdfa90..c510f8efc1bb 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.h +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.h @@ -27,7 +27,10 @@ #include <linux/list.h> +struct sg_table; + struct drm_i915_private; +struct drm_i915_gem_object; struct i915_ggtt; struct i915_vma; @@ -55,4 +58,17 @@ struct drm_i915_fence_reg { void i915_ggtt_init_fences(struct i915_ggtt *ggtt); +struct drm_i915_fence_reg * +i915_reserve_fence(struct drm_i915_private *i915); +void i915_unreserve_fence(struct drm_i915_fence_reg *fence); + +void i915_gem_revoke_fences(struct drm_i915_private *i915); +void i915_gem_restore_fences(struct drm_i915_private *i915); + +void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *i915); +void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, + struct sg_table *pages); +void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, + struct sg_table *pages); + #endif diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h index 422d90c686b5..925af79cc6d6 100644 --- a/drivers/gpu/drm/i915/i915_vma.h +++ b/drivers/gpu/drm/i915/i915_vma.h @@ -31,12 +31,12 @@ #include <drm/drm_mm.h> #include "i915_gem_gtt.h" -#include "i915_gem_fence_reg.h" #include "i915_gem_object.h" #include "i915_request.h" enum i915_cache_level; +struct drm_i915_fence_reg; /** * A VMA represents a GEM BO that is bound into an address space. Therefore, a
Since we have a header file for i915_gem_fence_reg, let's use it for the interface prototypes currently hidden away in the huge i915_drv.h Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.h | 15 --------------- drivers/gpu/drm/i915/i915_gem_fence_reg.h | 16 ++++++++++++++++ drivers/gpu/drm/i915/i915_vma.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-)