[igt-dev] [PATCH i-g-t v2] lib/i915: Move mmap IOCTLs wrappers into separate file

Chris Wilson chris at chris-wilson.co.uk
Tue Feb 26 17:06:20 UTC 2019


Quoting Antonio Argenziano (2019-02-26 17:01:59)
> Move all mmap flavours and support function to separate file in i915
> folder. This helps with moving i915 specific functions away from common
> libraries.
> 
> v2:
>         - Autotools still exists. (Petri)
>         - Include gem_mman.h directly. (Chris)
> 
> Signed-off-by: Antonio Argenziano <antonio.argenziano at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  benchmarks/gem_busy.c       |   7 +-
>  benchmarks/gem_exec_reloc.c |   6 +-
>  benchmarks/gem_mmap.c       |   6 +-
>  benchmarks/gem_wsim.c       |  11 +-
>  lib/Makefile.sources        |   2 +
>  lib/i915/gem_mman.c         | 254 ++++++++++++++++++++++++++++++++++++
>  lib/i915/gem_mman.h         |  55 ++++++++
>  lib/igt.h                   |   1 +
>  lib/igt_draw.c              |   1 +
>  lib/igt_dummyload.c         |   1 +
>  lib/igt_fb.c                |   1 +
>  lib/ioctl_wrappers.c        | 213 ------------------------------
>  lib/ioctl_wrappers.h        |  22 ----
>  lib/meson.build             |   1 +
>  tests/i915/gem_exec_reloc.c |   1 -
>  tests/i915/gem_stolen.c     |   9 +-
>  tests/prime_mmap.c          |   6 +-
>  17 files changed, 327 insertions(+), 270 deletions(-)
>  create mode 100644 lib/i915/gem_mman.c
>  create mode 100644 lib/i915/gem_mman.h
> 
> diff --git a/benchmarks/gem_busy.c b/benchmarks/gem_busy.c
> index ca517a16..bcb8a879 100644
> --- a/benchmarks/gem_busy.c
> +++ b/benchmarks/gem_busy.c
> @@ -39,12 +39,7 @@
>  #include <sys/time.h>
>  #include <time.h>
>  
> -#include "drm.h"
> -#include "ioctl_wrappers.h"
> -#include "drmtest.h"
> -#include "intel_chipset.h"
> -#include "intel_reg.h"
> -#include "igt_stats.h"
> +#include "igt.h"

Nope. That should never have happened. Keep dependencies explicit and
headers standalone.
-Chris


More information about the igt-dev mailing list