[Intel-gfx] [PATCH 31/43] drm/i915: Move object->pages API to i915_gem_object.[ch]

[Matthew Auld]

On 06/03/2019 14:25, Chris Wilson wrote:
> Currently the code for manipulating the pages on an object is still
> residing in i915_gem.c, move it to i915_gem_object.c
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/Makefile                 |   3 +-
>   .../gpu/drm/i915/{ => gem}/i915_gem_object.c  |   3 +-
>   .../gpu/drm/i915/{ => gem}/i915_gem_object.h  | 119 +++++++++++++++-
>   .../gem/test_i915_gem_object_standalone.c     |   7 +
>   drivers/gpu/drm/i915/i915_drv.h               | 129 +-----------------
>   drivers/gpu/drm/i915/i915_globals.c           |   2 +-
>   drivers/gpu/drm/i915/i915_vma.h               |   2 +-
>   7 files changed, 137 insertions(+), 128 deletions(-)
>   rename drivers/gpu/drm/i915/{ => gem}/i915_gem_object.c (99%)
>   rename drivers/gpu/drm/i915/{ => gem}/i915_gem_object.h (60%)
>   create mode 100644 drivers/gpu/drm/i915/gem/test_i915_gem_object_standalone.c
> 
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 2f84fac02578..d270f01e1091 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -60,6 +60,7 @@ i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
>   # Test the headers are compilable as standalone units
>   i915-$(CONFIG_DRM_I915_WERROR) += \
>   	gem/test_i915_gem_ioctls_standalone.o \
> +	gem/test_i915_gem_object_standalone.o \
>   	gem/test_i915_gem_object_types_standalone.o \
>   	test_i915_active_types_standalone.o \
>   	test_i915_gem_context_types_standalone.o \
> @@ -70,6 +71,7 @@ i915-$(CONFIG_DRM_I915_WERROR) += \
>   
>   # GEM code
>   i915-y += \
> +	  gem/i915_gem_object.o \
>   	  i915_active.o \
>   	  i915_cmd_parser.o \
>   	  i915_gem_batch_pool.o \
> @@ -82,7 +84,6 @@ i915-y += \
>   	  i915_gem_gtt.o \
>   	  i915_gem_internal.o \
>   	  i915_gem.o \
> -	  i915_gem_object.o \
>   	  i915_gem_render_state.o \
>   	  i915_gem_shrinker.o \
>   	  i915_gem_stolen.o \
> diff --git a/drivers/gpu/drm/i915/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> similarity index 99%
> rename from drivers/gpu/drm/i915/i915_gem_object.c
> rename to drivers/gpu/drm/i915/gem/i915_gem_object.c
> index ac6a5ab84586..93f4d92c9909 100644
> --- a/drivers/gpu/drm/i915/i915_gem_object.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> @@ -22,10 +22,11 @@
>    *
>    */
>   
> -#include "i915_drv.h"
>   #include "i915_gem_object.h"
>   #include "i915_globals.h"
>   
> +#include "../i915_drv.h"

#include "../i915_globals.h" ?

Reviewed-by: Matthew Auld <matthew.auld at intel.com>