[igt-dev] [PATCH i-g-t v3 6/9] lib/i915: Rename intel_tiling_info library

[Zbigniew Kempczyński]

On Thu, Feb 09, 2023 at 03:12:09PM +0100, Karolina Stolarek wrote:
> The structs here describe the properties of copy commands, not
> just tiling formats they support. Make the library name more
> generic.
> 
> Signed-off-by: Karolina Stolarek <karolina.stolarek at intel.com>

Squash 5/9 and 6/9, then:

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

> ---
>  lib/i915/i915_blt.h                                 | 2 +-
>  lib/i915/{intel_tiling_info.c => intel_cmds_info.c} | 2 +-
>  lib/i915/{intel_tiling_info.h => intel_cmds_info.h} | 4 ++--
>  lib/intel_chipset.h                                 | 2 +-
>  lib/meson.build                                     | 6 +++---
>  5 files changed, 8 insertions(+), 8 deletions(-)
>  rename lib/i915/{intel_tiling_info.c => intel_cmds_info.c} (98%)
>  rename lib/i915/{intel_tiling_info.h => intel_cmds_info.h} (93%)
> 
> diff --git a/lib/i915/i915_blt.h b/lib/i915/i915_blt.h
> index ceafc529..3fe47527 100644
> --- a/lib/i915/i915_blt.h
> +++ b/lib/i915/i915_blt.h
> @@ -47,7 +47,7 @@
>  #include <malloc.h>
>  #include "drm.h"
>  #include "igt.h"
> -#include "intel_tiling_info.h"
> +#include "intel_cmds_info.h"
>  
>  #define CCS_RATIO 256
>  
> diff --git a/lib/i915/intel_tiling_info.c b/lib/i915/intel_cmds_info.c
> similarity index 98%
> rename from lib/i915/intel_tiling_info.c
> rename to lib/i915/intel_cmds_info.c
> index e869acb3..9fce0351 100644
> --- a/lib/i915/intel_tiling_info.c
> +++ b/lib/i915/intel_cmds_info.c
> @@ -5,7 +5,7 @@
>  
>  #include <stdint.h>
>  #include "intel_chipset.h"
> -#include "i915/intel_tiling_info.h"
> +#include "i915/intel_cmds_info.h"
>  
>  #define BLT_INFO(_cmd, _tiling)  { \
>  		.blt_cmd_type = _cmd, \
> diff --git a/lib/i915/intel_tiling_info.h b/lib/i915/intel_cmds_info.h
> similarity index 93%
> rename from lib/i915/intel_tiling_info.h
> rename to lib/i915/intel_cmds_info.h
> index c7128a43..4fdce343 100644
> --- a/lib/i915/intel_tiling_info.h
> +++ b/lib/i915/intel_cmds_info.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef __INTEL_TILING_INFO_H
> -#define __INTEL_TILING_INFO_H
> +#ifndef __INTEL_CMDS_INFO_H
> +#define __INTEL_CMDS_INFO_H
>  
>  #include <stdint.h>
>  
> diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
> index 3de67483..c9762ae6 100644
> --- a/lib/intel_chipset.h
> +++ b/lib/intel_chipset.h
> @@ -31,7 +31,7 @@
>  #include <pciaccess.h>
>  #include <stdbool.h>
>  
> -#include "i915/intel_tiling_info.h"
> +#include "i915/intel_cmds_info.h"
>  
>  #define BIT(x) (1ul <<(x))
>  
> diff --git a/lib/meson.build b/lib/meson.build
> index d49b78ca..c5131d9a 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -14,7 +14,7 @@ lib_sources = [
>  	'i915/intel_decode.c',
>  	'i915/intel_memory_region.c',
>  	'i915/intel_mocs.c',
> -	'i915/intel_tiling_info.c',
> +	'i915/intel_cmds_info.c',
>  	'i915/i915_blt.c',
>  	'i915/i915_crc.c',
>  	'igt_collection.c',
> @@ -219,7 +219,7 @@ igt_deps = [ lib_igt ] + lib_deps
>  lin_igt_chipset_build = static_library('igt_chipset',
>                                         ['intel_chipset.c',
>  					'intel_device_info.c',
> -					'i915/intel_tiling_info.c'],
> +					'i915/intel_cmds_info.c'],
>                                         include_directories : inc)
>  
>  lib_igt_chipset = declare_dependency(link_with : lin_igt_chipset_build,
> @@ -242,7 +242,7 @@ lib_igt_device_scan_build = static_library('igt_device_scan',
>  	'igt_list.c',
>  	'igt_tools_stub.c',
>  	'intel_device_info.c',
> -	'i915/intel_tiling_info.c',
> +	'i915/intel_cmds_info.c',
>  	],
>  	dependencies : scan_dep,
>  	include_directories : inc)
> -- 
> 2.25.1
>