[PATCH 10/91] drm/i915: Move a few utility macros into a separate header

[Tvrtko Ursulin]

On 05/01/2017 10:34, Chris Wilson wrote:
> In order to defeat some circular dependencies between headers to allow use
> of e.g. range_overflows() in a header, move the simple independent macros
> into their own header.
>
> 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.c   |  4 ----
>  drivers/gpu/drm/i915/i915_utils.h | 44 +++++++++++++++++++++++++++++++++++++++
>  3 files changed, 45 insertions(+), 16 deletions(-)
>  create mode 100644 drivers/gpu/drm/i915/i915_utils.h
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 946d6ecd52d5..731395ccf4ad 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -52,6 +52,7 @@
>
>  #include "i915_params.h"
>  #include "i915_reg.h"
> +#include "i915_utils.h"
>
>  #include "intel_bios.h"
>  #include "intel_dpll_mgr.h"
> @@ -219,18 +220,6 @@ static inline const char *enableddisabled(bool v)
>  	return v ? "enabled" : "disabled";
>  }
>
> -#define range_overflows(start, size, max) ({ \
> -	typeof(start) start__ = (start); \
> -	typeof(size) size__ = (size); \
> -	typeof(max) max__ = (max); \
> -	(void)(&start__ == &size__); \
> -	(void)(&start__ == &max__); \
> -	start__ > max__ || size__ > max__ - start__; \
> -})
> -
> -#define range_overflows_t(type, start, size, max) \
> -	range_overflows((type)(start), (type)(size), (type)(max))
> -
>  enum pipe {
>  	INVALID_PIPE = -1,
>  	PIPE_A = 0,
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index e7a7f404fd85..25070ec66cf6 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4013,10 +4013,6 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = {
>  	.put_pages = i915_gem_object_put_pages_gtt,
>  };
>
> -/* Note we don't consider signbits :| */
> -#define overflows_type(x, T) \
> -	(sizeof(x) > sizeof(T) && (x) >> (sizeof(T) * BITS_PER_BYTE))
> -
>  struct drm_i915_gem_object *
>  i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size)
>  {
> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h
> new file mode 100644
> index 000000000000..9983ef30bac8
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/i915_utils.h
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright © 2016 Intel Corporation
> + *
> + * 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_UTILS_H
> +#define __I915_UTILS_H
> +
> +#define range_overflows(start, size, max) ({ \
> +	typeof(start) start__ = (start); \
> +	typeof(size) size__ = (size); \
> +	typeof(max) max__ = (max); \
> +	(void)(&start__ == &size__); \
> +	(void)(&start__ == &max__); \
> +	start__ > max__ || size__ > max__ - start__; \
> +})
> +
> +#define range_overflows_t(type, start, size, max) \
> +	range_overflows((type)(start), (type)(size), (type)(max))
> +
> +/* Note we don't consider signbits :| */
> +#define overflows_type(x, T) \
> +	(sizeof(x) > sizeof(T) && (x) >> (sizeof(T) * BITS_PER_BYTE))
> +
> +#endif /* !__I915_UTILS_H */
>

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

Regards,

Tvrtko