diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-06 10:54:51 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-07 13:04:24 -0400 |
| commit | 25d2f85bf57fb0a56eeb60d00465b99f069f4376 (patch) | |
| tree | a93ce9dddbeddcdec4a1cbeb18b4fe87d57d8830 | |
| parent | c947b6aba56d23496acde6ee68a96d0c28a68d77 (diff) | |
include: Introduce linux-uapi for non-drm-uapi files.
sync_file.h is needed for dma-buf, but it is part of the
linux-uapi include dir.
The patch aims to have a drm-uapi directory that is a pure
copy of the generated drm-uapi include dir.
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | include/linux-uapi/sync_file.h (renamed from include/drm-uapi/sync_file.h) | 0 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -154,8 +154,18 @@ These should be updated all together by: # From the kernel dir with a drm/drm-next commit checked out: $ make INSTALL_HDR_PATH=<dest-dir> headers_install $ rm -f <igt-dir>/include/drm-uapi/* - $ cp <dest-dir>/include/linux/sync_file.h <igt-dir>/include/drm-uapi/ $ cp <dest-dir>/include/drm/* <igt-dir>/include/drm-uapi/ Then, commit with a note of which exact commit from airlied's branch was used to generate them. + +### `include/linux-uapi/sync_file.h` + +Imported non-DRM uapi headers from airlied's drm-next branch. + + # From the kernel dir with a drm/drm-next commit checked out: + $ make INSTALL_HDR_PATH=<destdir> headers_install + $ cp <destdir>/include/linux/sync_file.h ~/igt/include/linux-uapi/ + +Then, commit with a note of which exact commit from airlied's branch +was used to generate them. diff --git a/include/drm-uapi/sync_file.h b/include/linux-uapi/sync_file.h index b4f2db00..b4f2db00 100644 --- a/include/drm-uapi/sync_file.h +++ b/include/linux-uapi/sync_file.h diff --git a/meson.build b/meson.build index 06e76189..f9a284d8 100644 --- a/meson.build +++ b/meson.build @@ -86,7 +86,7 @@ with_libdrm = get_option('libdrm_drivers') build_info = ['Build type: ' + get_option('buildtype')] -inc = include_directories('include/drm-uapi', 'lib', 'lib/stubs/syscalls', '.') +inc = include_directories('include/drm-uapi', 'include/linux-uapi', 'lib', 'lib/stubs/syscalls', '.') inc_for_gtkdoc = include_directories('lib') |