[Intel-gfx] [PATCH 03/15] drm/i915: Move i915_gem_chipset_flush to where it belongs

[Thierry, Michel]

> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Daniel Vetter
> Sent: Wednesday, August 06, 2014 2:05 PM
> To: Intel Graphics Development
> Cc: Daniel Vetter
> Subject: [Intel-gfx] [PATCH 03/15] drm/i915: Move i915_gem_chipset_flush
> to where it belongs
> 
> Include depency hell ftw! So need to move this into a real function.
> 
> Also fix up the header include order in i915_drv.h: The rule is to
> always include core headers first, then local stuff.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_drv.h     | 7 -------
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++++++
>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
>  3 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> b/drivers/gpu/drm/i915/i915_drv.h
> index d349dd75ed69..194367f0ba1a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2556,13 +2556,6 @@ int __must_check
> i915_gem_evict_something(struct drm_device *dev,
>  int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle);
>  int i915_gem_evict_everything(struct drm_device *dev);
> 
> -/* belongs in i915_gem_gtt.h */
> -static inline void i915_gem_chipset_flush(struct drm_device *dev)
> -{
> -	if (INTEL_INFO(dev)->gen < 6)
> -		intel_gtt_chipset_flush();
> -}
> -
>  /* i915_gem_stolen.c */
>  int i915_gem_init_stolen(struct drm_device *dev);
>  int i915_gem_stolen_setup_compression(struct drm_device *dev, int size,
> int fb_cpp);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 1a20e1b4f052..baa94199239b 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2031,6 +2031,12 @@ static void gen6_gmch_remove(struct
> i915_address_space *vm)
>  	teardown_scratch_page(vm->dev);
>  }
> 
> +void i915_gem_chipset_flush(struct drm_device *dev)
> +{
> +	if (INTEL_INFO(dev)->gen < 6)
> +		intel_gtt_chipset_flush();
> +}
> +
>  static int i915_gmch_probe(struct drm_device *dev,
>  			   size_t *gtt_total,
>  			   size_t *stolen,
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h
> b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 57d401343e8d..380e034c66f8 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -294,4 +294,6 @@ void i915_gem_restore_gtt_mappings(struct
> drm_device *dev);
>  int __must_check i915_gem_gtt_prepare_object(struct
> drm_i915_gem_object *obj);
>  void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj);
> 
> +void i915_gem_chipset_flush(struct drm_device *dev);
> +
>  #endif
> --
> 1.9.3

Reviewed-by: Michel Thierry <michel.thierry at intel.com>
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6656 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20140812/c5341cb5/attachment.bin>