drm/i915: Move a few utility macros into a separate header (40b326ee) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.h

+1 −12

Original line number	Diff line number	Diff line
		@@ -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,

drivers/gpu/drm/i915/i915_gem.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -4004,10 +4004,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)
		{

drivers/gpu/drm/i915/i915_utils.h

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* 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 */

Admin message