[Intel-gfx] [PATCH 1/6] drm/i915: Split i915_gem_batch_pool into its own header

[Tvrtko Ursulin]

On 03/09/2015 09:55 AM, Chris Wilson wrote:
> In the next patch, I want to use the structure elsewhere and so require
> it defined earlier. Rather than move the definition to an earlier location
> where it feels very odd, place it in its own header file.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/i915_drv.h            | 13 +--------
>   drivers/gpu/drm/i915/i915_gem_batch_pool.c |  1 +
>   drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 ++++++++++++++++++++++++++++++
>   3 files changed, 44 insertions(+), 12 deletions(-)
>   create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index c986e355e4d0..b62e3c478221 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -37,6 +37,7 @@
>   #include "intel_bios.h"
>   #include "intel_ringbuffer.h"
>   #include "intel_lrc.h"
> +#include "i915_gem_batch_pool.h"
>   #include "i915_gem_gtt.h"
>   #include "i915_gem_render_state.h"
>   #include <linux/io-mapping.h>
> @@ -1135,11 +1136,6 @@ struct intel_l3_parity {
>   	int which_slice;
>   };
>
> -struct i915_gem_batch_pool {
> -	struct drm_device *dev;
> -	struct list_head cache_list;
> -};
> -
>   struct i915_gem_mm {
>   	/** Memory allocator for GTT stolen memory */
>   	struct drm_mm stolen;
> @@ -3048,13 +3044,6 @@ void i915_destroy_error_state(struct drm_device *dev);
>   void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone);
>   const char *i915_cache_level_str(struct drm_i915_private *i915, int type);
>
> -/* i915_gem_batch_pool.c */
> -void i915_gem_batch_pool_init(struct drm_device *dev,
> -			      struct i915_gem_batch_pool *pool);
> -void i915_gem_batch_pool_fini(struct i915_gem_batch_pool *pool);
> -struct drm_i915_gem_object*
> -i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, size_t size);
> -
>   /* i915_cmd_parser.c */
>   int i915_cmd_parser_get_version(void);
>   int i915_cmd_parser_init_ring(struct intel_engine_cs *ring);
> diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> index c690170a1c4f..564be7c5ea7e 100644
> --- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> @@ -23,6 +23,7 @@
>    */
>
>   #include "i915_drv.h"
> +#include "i915_gem_batch_pool.h"
>
>   /**
>    * DOC: batch pool
> diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.h b/drivers/gpu/drm/i915/i915_gem_batch_pool.h
> new file mode 100644
> index 000000000000..5ed70ef6a887
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.h
> @@ -0,0 +1,42 @@
> +/*
> + * Copyright © 2014 Intel Corporation

Maybe 2014-15. or whatever the guidelines are?

> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef I915_GEM_BATCH_POOL_H
> +#define I915_GEM_BATCH_POOL_H
> +
> +#include "i915_drv.h"
> +
> +struct i915_gem_batch_pool {
> +	struct drm_device *dev;
> +	struct list_head cache_list;
> +};
> +
> +/* i915_gem_batch_pool.c */
> +void i915_gem_batch_pool_init(struct drm_device *dev,
> +			      struct i915_gem_batch_pool *pool);
> +void i915_gem_batch_pool_fini(struct i915_gem_batch_pool *pool);
> +struct drm_i915_gem_object*
> +i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, size_t size);
> +
> +#endif /* I915_GEM_BATCH_POOL_H */
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko