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

[Daniel Vetter]

On Wed, Aug 13, 2014 at 11:51:55AM +0100, Chris Wilson wrote:
> From: Daniel Vetter <daniel.vetter at ffwll.ch>
> 
> That's right, back to where it was!
> 
> This effectively reverts

Hm, why?
-Daniel

> 
> commit 9aa2062bb850e665b3b673b53bd90127d1215490
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Wed Aug 6 15:04:46 2014 +0200
> 
>     drm/i915: Move i915_gem_chipset_flush to where it belongs
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_drv.h     | 6 ++++++
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ------
>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 --
>  3 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index d0222cb9b7a5..8dbfa18c265b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3007,4 +3007,10 @@ wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms)
>  	}
>  }
>  
> +static inline void i915_gem_chipset_flush(struct drm_device *dev)
> +{
> +	if (INTEL_INFO(dev)->gen < 6)
> +		intel_gtt_chipset_flush();
> +}
> +
>  #endif
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index b8d5a5d67a73..bbab8156b7ca 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2070,12 +2070,6 @@ 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 55de8aec0a33..6280648d4805 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -299,6 +299,4 @@ 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
> -- 
> 2.1.0.rc1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch