Skip to contentSkip to conversation

Import drm UAPI headers.

PATCH In review Eric Anholt 5 participants 16 messages Nov 10, 2017 – Nov 22, 2017

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Import drm UAPI headers.

This series imports the UAPI headers from Linux, like we've been doing in Mesa for vc4 and i965. The advantage is that it lets you build new kernel UAPI and testcases together, without needing libdrm releases, and has a simple rule for producing header updates (avoiding the need for the LOCAL_* define hacks that have been proliferating in the tree)

I started on converting i915 to not use LOCAL_*, but it's more than I'm willing to complete.

Eric Anholt (5):
headers: Import drm-next uapi headers.
tests: Convert to using the imported drm-uapi headers.
tests: Remove libdrm_vc4 dependency.
lib: Use the imported uapi's addfb2 defines.
lib: Use drm-uapi/i915_drm.h instead of local defines.

 README                         |    8 +
 benchmarks/Makefile.am         |    6 +-
 benchmarks/gem_wsim.c          |    6 +-
 configure.ac                   |   12 +-
 include/drm-uapi/amdgpu_drm.h  |  930 ++++++++++++++++++++++++
 include/drm-uapi/armada_drm.h  |   55 ++
 include/drm-uapi/drm.h         |  988 +++++++++++++++++++++++++
 include/drm-uapi/drm_fourcc.h  |  410 +++++++++++
 include/drm-uapi/drm_mode.h    |  855 ++++++++++++++++++++++
 include/drm-uapi/drm_sarea.h   |   92 +++
 include/drm-uapi/etnaviv_drm.h |  282 ++++++++
 include/drm-uapi/exynos_drm.h  |  373 ++++++++++
 include/drm-uapi/i810_drm.h    |  291 ++++++++
 include/drm-uapi/i915_drm.h    | 1542 ++++++++++++++++++++++++++++++++++++++++
 include/drm-uapi/mga_drm.h     |  427 +++++++++++
 include/drm-uapi/msm_drm.h     |  306 ++++++++
 include/drm-uapi/nouveau_drm.h |  152 ++++
 include/drm-uapi/omap_drm.h    |  125 ++++
 include/drm-uapi/qxl_drm.h     |  158 ++++
 include/drm-uapi/r128_drm.h    |  336 +++++++++
 include/drm-uapi/radeon_drm.h  | 1078 ++++++++++++++++++++++++++++
 include/drm-uapi/savage_drm.h  |  220 ++++++
 include/drm-uapi/sis_drm.h     |   77 ++
 include/drm-uapi/tegra_drm.h   |  209 ++++++
 include/drm-uapi/vc4_drm.h     |  359 ++++++++++
 include/drm-uapi/vgem_drm.h    |   62 ++
 include/drm-uapi/via_drm.h     |  282 ++++++++
 include/drm-uapi/virtgpu_drm.h |  174 +++++
 include/drm-uapi/vmwgfx_drm.h  | 1128 +++++++++++++++++++++++++++++
 lib/Makefile.am                |    7 +-
 lib/i915/gem_context.c         |   46 +-
 lib/i915/gem_context.h         |   19 +-
 lib/igt_gt.c                   |   38 +-
 lib/ioctl_wrappers.c           |   71 +-
 lib/meson.build                |    6 +-
 meson.build                    |    3 +-
 tests/Makefile.am              |   16 +-
 tests/gem_ctx_param.c          |   38 +-
 tests/meson.build              |   16 +-
 39 files changed, 11032 insertions(+), 171 deletions(-)
 create mode 100644 include/drm-uapi/amdgpu_drm.h
 create mode 100644 include/drm-uapi/armada_drm.h
 create mode 100644 include/drm-uapi/drm.h
 create mode 100644 include/drm-uapi/drm_fourcc.h
 create mode 100644 include/drm-uapi/drm_mode.h
 create mode 100644 include/drm-uapi/drm_sarea.h
 create mode 100644 include/drm-uapi/etnaviv_drm.h
 create mode 100644 include/drm-uapi/exynos_drm.h
 create mode 100644 include/drm-uapi/i810_drm.h
 create mode 100644 include/drm-uapi/i915_drm.h
 create mode 100644 include/drm-uapi/mga_drm.h
 create mode 100644 include/drm-uapi/msm_drm.h
 create mode 100644 include/drm-uapi/nouveau_drm.h
 create mode 100644 include/drm-uapi/omap_drm.h
 create mode 100644 include/drm-uapi/qxl_drm.h
 create mode 100644 include/drm-uapi/r128_drm.h
 create mode 100644 include/drm-uapi/radeon_drm.h
 create mode 100644 include/drm-uapi/savage_drm.h
 create mode 100644 include/drm-uapi/sis_drm.h
 create mode 100644 include/drm-uapi/tegra_drm.h
 create mode 100644 include/drm-uapi/vc4_drm.h
 create mode 100644 include/drm-uapi/vgem_drm.h
 create mode 100644 include/drm-uapi/via_drm.h
 create mode 100644 include/drm-uapi/virtgpu_drm.h
 create mode 100644 include/drm-uapi/vmwgfx_drm.h
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/5 headers: Import drm-next uapi headers.

These will be used for tests that want to use a local copy of the headers instead of depending on libdrm releases. Taken from drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of
git://anongit.freedesktop.org/drm/drm-misc into drm-next")

See README for rules on updating these headers.

---
 README                         |    8 +
 include/drm-uapi/amdgpu_drm.h  |  930 ++++++++++++++++++++++++
 include/drm-uapi/armada_drm.h  |   55 ++
 include/drm-uapi/drm.h         |  988 +++++++++++++++++++++++++
 include/drm-uapi/drm_fourcc.h  |  410 +++++++++++
 include/drm-uapi/drm_mode.h    |  855 ++++++++++++++++++++++
 include/drm-uapi/drm_sarea.h   |   92 +++
 include/drm-uapi/etnaviv_drm.h |  282 ++++++++
 include/drm-uapi/exynos_drm.h  |  373 ++++++++++
 include/drm-uapi/i810_drm.h    |  291 ++++++++
 include/drm-uapi/i915_drm.h    | 1542 ++++++++++++++++++++++++++++++++++++++++
 include/drm-uapi/mga_drm.h     |  427 +++++++++++
 include/drm-uapi/msm_drm.h     |  306 ++++++++
 include/drm-uapi/nouveau_drm.h |  152 ++++
 include/drm-uapi/omap_drm.h    |  125 ++++
 include/drm-uapi/qxl_drm.h     |  158 ++++
 include/drm-uapi/r128_drm.h    |  336 +++++++++
 include/drm-uapi/radeon_drm.h  | 1078 ++++++++++++++++++++++++++++
 include/drm-uapi/savage_drm.h  |  220 ++++++
 include/drm-uapi/sis_drm.h     |   77 ++
 include/drm-uapi/tegra_drm.h   |  209 ++++++
 include/drm-uapi/vc4_drm.h     |  359 ++++++++++
 include/drm-uapi/vgem_drm.h    |   62 ++
 include/drm-uapi/via_drm.h     |  282 ++++++++
 include/drm-uapi/virtgpu_drm.h |  174 +++++
 include/drm-uapi/vmwgfx_drm.h  | 1128 +++++++++++++++++++++++++++++
 26 files changed, 10919 insertions(+)
 create mode 100644 include/drm-uapi/amdgpu_drm.h
 create mode 100644 include/drm-uapi/armada_drm.h
 create mode 100644 include/drm-uapi/drm.h
 create mode 100644 include/drm-uapi/drm_fourcc.h
 create mode 100644 include/drm-uapi/drm_mode.h
 create mode 100644 include/drm-uapi/drm_sarea.h
 create mode 100644 include/drm-uapi/etnaviv_drm.h
 create mode 100644 include/drm-uapi/exynos_drm.h
 create mode 100644 include/drm-uapi/i810_drm.h
 create mode 100644 include/drm-uapi/i915_drm.h
 create mode 100644 include/drm-uapi/mga_drm.h
 create mode 100644 include/drm-uapi/msm_drm.h
 create mode 100644 include/drm-uapi/nouveau_drm.h
 create mode 100644 include/drm-uapi/omap_drm.h
 create mode 100644 include/drm-uapi/qxl_drm.h
 create mode 100644 include/drm-uapi/r128_drm.h
 create mode 100644 include/drm-uapi/radeon_drm.h
 create mode 100644 include/drm-uapi/savage_drm.h
 create mode 100644 include/drm-uapi/sis_drm.h
 create mode 100644 include/drm-uapi/tegra_drm.h
 create mode 100644 include/drm-uapi/vc4_drm.h
 create mode 100644 include/drm-uapi/vgem_drm.h
 create mode 100644 include/drm-uapi/via_drm.h
 create mode 100644 include/drm-uapi/virtgpu_drm.h
 create mode 100644 include/drm-uapi/vmwgfx_drm.h
README +8 -0
index 2c2cd3637a43..e0f829defb51 100644
@@ -126,6 +126,14 @@ docs/
 	intel-gpu-tools-sections.txt. Entirely new sections will also need to be
 	added to intel-gpu-tools-docs.xml in the appropriate place.
 
+include/drm-uapi
+	Imported DRM uapi headers from airlied's drm-next branch.
+	These should be updated all together by executing "make
+	headers_install" from that branch of the kernel and then
+	copying the resulting ./usr/include/drm/*.h in and committing
+	with a note of which commit on airlied's branch was used to
+	generate them.
+
 
 Requirements
 ------------
include/drm-uapi/amdgpu_drm.h new file +930 -0

930 lines not on this page · raw message

include/drm-uapi/armada_drm.h new file +55 -0

55 lines not on this page · raw message

include/drm-uapi/drm.h new file +988 -0

988 lines not on this page · raw message

include/drm-uapi/drm_fourcc.h new file +410 -0

410 lines not on this page · raw message

include/drm-uapi/drm_mode.h new file +855 -0

603 lines not on this page · raw message

include/drm-uapi/drm_sarea.h new file +92 -0

92 lines not on this page · raw message

include/drm-uapi/etnaviv_drm.h new file +282 -0

282 lines not on this page · raw message

include/drm-uapi/exynos_drm.h new file +373 -0

373 lines not on this page · raw message

include/drm-uapi/i810_drm.h new file +291 -0

291 lines not on this page · raw message

include/drm-uapi/i915_drm.h new file +1542 -0

1,542 lines not on this page · raw message

include/drm-uapi/mga_drm.h new file +427 -0

427 lines not on this page · raw message

include/drm-uapi/msm_drm.h new file +306 -0

306 lines not on this page · raw message

include/drm-uapi/nouveau_drm.h new file +152 -0

152 lines not on this page · raw message

include/drm-uapi/omap_drm.h new file +125 -0

125 lines not on this page · raw message

include/drm-uapi/qxl_drm.h new file +158 -0

158 lines not on this page · raw message

include/drm-uapi/r128_drm.h new file +336 -0

336 lines not on this page · raw message

include/drm-uapi/radeon_drm.h new file +1078 -0

1,078 lines not on this page · raw message

include/drm-uapi/savage_drm.h new file +220 -0

220 lines not on this page · raw message

include/drm-uapi/sis_drm.h new file +77 -0

77 lines not on this page · raw message

include/drm-uapi/tegra_drm.h new file +209 -0

209 lines not on this page · raw message

include/drm-uapi/vc4_drm.h new file +359 -0

359 lines not on this page · raw message

include/drm-uapi/vgem_drm.h new file +62 -0

62 lines not on this page · raw message

include/drm-uapi/via_drm.h new file +282 -0

282 lines not on this page · raw message

include/drm-uapi/virtgpu_drm.h new file +174 -0

174 lines not on this page · raw message

include/drm-uapi/vmwgfx_drm.h new file +1128 -0

1,128 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 2/5 tests: Convert to using the imported drm-uapi headers.

In reply to Eric Anholt

Tested by dropping garbage in my libdrm's headers and rebuilding.

---
 lib/Makefile.am   | 5 ++++-
 meson.build       | 2 +-
 tests/Makefile.am | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)
lib/Makefile.am +4 -1
index 30ddb92bd0bc..7b3d87780db9 100644
@@ -46,7 +46,10 @@ lib_source_list +=		\
 	$(NULL)
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)
+
 AM_CFLAGS = \
 	    $(CWARNFLAGS) \
 	    $(DRM_CFLAGS) \
meson.build +1 -1
index fb81c4dbbd55..b14617a5f5d0 100644
@@ -26,7 +26,7 @@ foreach cc_arg : cc_args
   endif
 endforeach
 
-inc = include_directories('lib', '.')
+inc = include_directories('include/drm-uapi', 'lib', '.')
 
 config = configuration_data()
 
tests/Makefile.am +1 -0
index 89a970153992..ba5acefa68b4 100644
@@ -85,6 +85,7 @@ EXTRA_DIST = \
 CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
 
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
+	-I$(top_srcdir)/include/drm-uapi \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../lib \
 	-include "$(srcdir)/../lib/check-ndebug.h" \
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH i-g-t 2/5] tests: Convert to using the imported drm-uapi headers.

Quoted 43 lines · Eric Anholt

Tested by dropping garbage in my libdrm's headers and rebuilding.

---
  lib/Makefile.am   | 5 ++++-
  meson.build       | 2 +-
  tests/Makefile.am | 1 +
  3 files changed, 6 insertions(+), 2 deletions(-)
lib/Makefile.am +4 -1
index 30ddb92bd0bc..7b3d87780db9 100644
@@ -46,7 +46,10 @@ lib_source_list +=		\
  	$(NULL)
  endif
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)
+
  AM_CFLAGS = \
  	    $(CWARNFLAGS) \
  	    $(DRM_CFLAGS) \
meson.build +1 -1
index fb81c4dbbd55..b14617a5f5d0 100644
@@ -26,7 +26,7 @@ foreach cc_arg : cc_args
    endif
  endforeach
 
-inc = include_directories('lib', '.')
+inc = include_directories('include/drm-uapi', 'lib', '.')
 
  config = configuration_data()
 
tests/Makefile.am +0 -0
index 89a970153992..ba5acefa68b4 100644

tests/Makefile.am EXTRA_DIST = \ · line 88

Quoted 4 lines
tests/Makefile.am +1 -0
@@ -85,6 +85,7 @@ EXTRA_DIST = \
  CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
 
  AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
+	-I$(top_srcdir)/include/drm-uapi \

That seems to put include/drm-uapi after $(DRM_CFLAGS) which probably means you're picking up the system headers first. I guess you want to have it the other way?

tests/Makefile.am EXTRA_DIST = \ · line 91

Quoted 3 lines
tests/Makefile.am +0 -0
  	-I$(srcdir)/.. \
  	-I$(srcdir)/../lib \
  	-include "$(srcdir)/../lib/check-ndebug.h" \

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH i-g-t 2/5] tests: Convert to using the imported drm-uapi headers.

Quoted 46 lines · Lionel Landwerlin
Quoted 45 lines · Eric Anholt

Tested by dropping garbage in my libdrm's headers and rebuilding.

---
  lib/Makefile.am   | 5 ++++-
  meson.build       | 2 +-
  tests/Makefile.am | 1 +
  3 files changed, 6 insertions(+), 2 deletions(-)
lib/Makefile.am +4 -1
index 30ddb92bd0bc..7b3d87780db9 100644
@@ -46,7 +46,10 @@ lib_source_list +=		\
  	$(NULL)
  endif
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)
+
  AM_CFLAGS = \
  	    $(CWARNFLAGS) \
  	    $(DRM_CFLAGS) \
meson.build +1 -1
index fb81c4dbbd55..b14617a5f5d0 100644
@@ -26,7 +26,7 @@ foreach cc_arg : cc_args
    endif
  endforeach
 
-inc = include_directories('lib', '.')
+inc = include_directories('include/drm-uapi', 'lib', '.')
 
  config = configuration_data()
 
tests/Makefile.am +0 -0
index 89a970153992..ba5acefa68b4 100644
@@ -85,6 +85,7 @@ EXTRA_DIST = \
  CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
 
Quoted 6 lines

tests/Makefile.am EXTRA_DIST = \ · line 88

Quoted 2 lines
tests/Makefile.am +1 -0
  AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
+	-I$(top_srcdir)/include/drm-uapi \

That seems to put include/drm-uapi after $(DRM_CFLAGS) which probably means you're picking up the system headers first.
I guess you want to have it the other way?

Oh, that had accidentally ended up in patch 5. Thanks!

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 3/5 tests: Remove libdrm_vc4 dependency.

In reply to Eric Anholt

The autotools build retains the configure.ac option, while meson folds vc4 into the default build since we don't have any meson_options.txt to control parts of the build.

---
 configure.ac      | 12 ++++--------
 lib/Makefile.am   |  2 +-
 lib/meson.build   |  6 ++----
 meson.build       |  1 -
 tests/Makefile.am | 12 +-----------
 tests/meson.build | 16 +++++-----------
 6 files changed, 13 insertions(+), 36 deletions(-)
configure.ac +4 -8
index 53ef704e4a0e..adb5998142ef 100644
@@ -288,16 +288,12 @@ fi
 AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
 
 AC_ARG_ENABLE(vc4, AS_HELP_STRING([--disable-vc4],
-	      [Enable building of vc4 tests (default: auto)]),
-	      [VC4=$enableval], [VC4=auto])
-if test "x$VC4" = xauto; then
-	PKG_CHECK_EXISTS([libdrm_vc4], [VC4=yes], [VC4=no])
-fi
+	      [Enable building of vc4 tests (default: yes)]),
+	      [VC4=$enableval], [VC4=yes])
 if test "x$VC4" = xyes; then
-	PKG_CHECK_MODULES(DRM_VC4, [libdrm_vc4])
-	AC_DEFINE(HAVE_LIBDRM_VC4, 1, [Have vc4 support])
+	AC_DEFINE(BUILD_VC4, 1, [Have vc4 support])
 fi
-AM_CONDITIONAL(HAVE_LIBDRM_VC4, [test "x$VC4" = xyes])
+AM_CONDITIONAL(BUILD_VC4, [test "x$VC4" = xyes])
 
 # Define a configure option for the shader debugger
 AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
lib/Makefile.am +1 -1
index 7b3d87780db9..9c511dc0a8f9 100644
@@ -10,7 +10,7 @@ libintel_tools_la_SOURCES = $(lib_source_list)
 noinst_LTLIBRARIES = libintel_tools.la
 noinst_HEADERS = check-ndebug.h
 
-if HAVE_LIBDRM_VC4
+if BUILD_VC4
     libintel_tools_la_SOURCES += 	\
         igt_vc4.c			\
         igt_vc4.h
lib/meson.build +2 -4
index ddf93ec6e350..253548dca9ef 100644
@@ -47,6 +47,7 @@ lib_headers = [
 	'igt_dummyload.h',
 	'uwildmat/uwildmat.h',
 	'igt_kmod.h',
+	'igt_vc4.h',
 ]
 
 lib_sources = [
@@ -95,6 +96,7 @@ lib_sources = [
 	'igt_dummyload.c',
 	'uwildmat/uwildmat.c',
 	'igt_kmod.c',
+	'igt_vc4.c',
 ]
 
 lib_deps = [
@@ -118,10 +120,6 @@ else
 	lib_sources += 'stubs/drm/intel_bufmgr.c'
 endif
 
-if libdrm_vc4.found()
-	lib_headers += 'igt_vc4.h'
-	lib_sources += 'igt_vc4.c'
-endif
 if valgrind.found()
 	lib_deps += valgrind
 endif
meson.build +0 -1
index b14617a5f5d0..2361866b32d2 100644
@@ -32,7 +32,6 @@ config = configuration_data()
 
 libdrm = dependency('libdrm', version : '>=2.4.82')
 libdrm_intel = dependency('libdrm_intel', required : false)
-libdrm_vc4 = dependency('libdrm_vc4', required : false)
 libdrm_nouveau = dependency('libdrm_nouveau', required : false)
 libdrm_amdgpu = dependency('libdrm_amdgpu', required : false)
 
tests/Makefile.am +1 -11
index ba5acefa68b4..27acfb358582 100644
@@ -10,7 +10,7 @@ if HAVE_LIBDRM_NOUVEAU
     TESTS_progs += $(NOUVEAU_TESTS)
 endif
 
-if HAVE_LIBDRM_VC4
+if BUILD_VC4
     TESTS_progs += $(VC4_TESTS)
 endif
 
@@ -143,16 +143,6 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
 prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
-vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
-vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
-vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
-vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS)
-vc4_dmabuf_poll_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
-vc4_dmabuf_poll_LDADD = $(LDADD) $(DRM_VC4_LIBS)
-vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
-vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
-vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
-vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS)
 
 chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
 chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
tests/meson.build +5 -11
index c3d5372f78ac..3b523593af00 100644
@@ -213,6 +213,11 @@ test_progs = [
 	'syncobj_wait',
 	'template',
 	'tools_test',
+	'vc4_create_bo',
+	'vc4_dmabuf_poll',
+	'vc4_lookup_fail',
+	'vc4_wait_bo',
+	'vc4_wait_seqno',
 	'vgem_basic',
 	'vgem_slow',
 ]
@@ -238,17 +243,6 @@ if libdrm_nouveau.found()
 	test_deps += libdrm_nouveau
 endif
 
-if libdrm_vc4.found()
-	test_progs += [
-		'vc4_create_bo',
-		'vc4_dmabuf_poll',
-		'vc4_lookup_fail',
-		'vc4_wait_bo',
-		'vc4_wait_seqno',
-	]
-	test_deps += libdrm_vc4
-endif
-
 if chamelium.found()
 	test_progs += [
 		'chamelium',
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

Re: [PATCH i-g-t 3/5] tests: Remove libdrm_vc4 dependency.

This commit caused

../../../lib/igt_vc4.c:42:10: fatal error: vc4_packet.h: No such file or directory

 #include "vc4_packet.h"
           ^~~~~~~~~~~~~~

in distcheck, which uses the default configure options.

Signature · 5 lines
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

PATCH 4/5 lib: Use the imported uapi's addfb2 defines.

In reply to Eric Anholt
---
 lib/ioctl_wrappers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/ioctl_wrappers.c +2 -2
index 7ad2b7b007c4..d98e7660a96f 100644
@@ -1663,7 +1663,7 @@ void igt_require_fb_modifiers(int fd)
 		uint64_t cap_modifiers;
 		int ret;
 
-		ret = drmGetCap(fd, LOCAL_DRM_CAP_ADDFB2_MODIFIERS, &cap_modifiers);
+		ret = drmGetCap(fd, DRM_CAP_ADDFB2_MODIFIERS, &cap_modifiers);
 		igt_assert(ret == 0 || errno == EINVAL);
 		has_modifiers = ret == 0 && cap_modifiers == 1;
 		cap_modifiers_tested = true;
@@ -1691,7 +1691,7 @@ int __kms_addfb(int fd, uint32_t handle, uint32_t width, uint32_t height,
 	f.pitches[0] = stride;
 	f.modifier[0] = modifier;
 
-	ret = igt_ioctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f);
+	ret = igt_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f);
 
 	*buf_id = f.fb_id;
 
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

PATCH 5/5 lib: Use drm-uapi/i915_drm.h instead of local defines.

In reply to Eric Anholt

The MMAP_V2 is replaced by just using MMAP, since the official header has the updated struct. The gem_create_v2 and gem_get_aperture are left as is, because they seem to not be reflected in the UABI header!

---
 benchmarks/Makefile.am |  6 ++++-
 benchmarks/gem_wsim.c  |  6 ++---
 lib/i915/gem_context.c | 46 ++++++++++++++++------------------
 lib/i915/gem_context.h | 19 +++-----------
 lib/igt_gt.c           | 38 ++++++++++++++--------------
 lib/ioctl_wrappers.c   | 67 ++++++++++++++------------------------------------
 tests/Makefile.am      |  3 ++-
 tests/gem_ctx_param.c  | 38 ++++++++++++++--------------
 8 files changed, 92 insertions(+), 131 deletions(-)
benchmarks/Makefile.am +5 -1
index d066112a32a2..9f2671be192b 100644
@@ -8,7 +8,11 @@ if HAVE_LIBDRM_INTEL
 benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)/lib
+
 AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
 	    $(WERROR_CFLAGS) -D_GNU_SOURCE
 LDADD = $(top_builddir)/lib/libintel_tools.la
benchmarks/gem_wsim.c +3 -3
index 82fe6ba9ec5f..063f3ca37f00 100644
@@ -893,9 +893,9 @@ prepare_workload(unsigned int id, struct workload *wrk, unsigned int flags)
 			}
 
 			if (wrk->prio) {
-				struct local_i915_gem_context_param param = {
-					.context = arg.ctx_id,
-					.param = 0x6,
+				struct drm_i915_gem_context_param param = {
+					.ctx_id = arg.ctx_id,
+					.param = I915_CONTEXT_PARAM_PRIORITY,
 					.value = wrk->prio,
 				};
 				gem_context_set_param(fd, &param);
lib/i915/gem_context.c +21 -25

113 lines not on this page · raw message

lib/i915/gem_context.h +4 -15
index a2339c4b6da2..96106b718ffb 100644
@@ -27,23 +27,12 @@
 uint32_t gem_context_create(int fd);
 void gem_context_destroy(int fd, uint32_t ctx_id);
 int __gem_context_destroy(int fd, uint32_t ctx_id);
-struct local_i915_gem_context_param {
-	uint32_t context;
-	uint32_t size;
-	uint64_t param;
-#define LOCAL_CONTEXT_PARAM_BAN_PERIOD	0x1
-#define LOCAL_CONTEXT_PARAM_NO_ZEROMAP	0x2
-#define LOCAL_CONTEXT_PARAM_GTT_SIZE	0x3
-#define LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE	0x4
-#define LOCAL_CONTEXT_PARAM_BANNABLE	0x5
-	uint64_t value;
-};
 void gem_context_require_bannable(int fd);
 void gem_context_require_param(int fd, uint64_t param);
-void gem_context_get_param(int fd, struct local_i915_gem_context_param *p);
-void gem_context_set_param(int fd, struct local_i915_gem_context_param *p);
-int __gem_context_set_param(int fd, struct local_i915_gem_context_param *p);
-int __gem_context_get_param(int fd, struct local_i915_gem_context_param *p);
+void gem_context_get_param(int fd, struct drm_i915_gem_context_param *p);
+void gem_context_set_param(int fd, struct drm_i915_gem_context_param *p);
+int __gem_context_set_param(int fd, struct drm_i915_gem_context_param *p);
+int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p);
 
 #define LOCAL_I915_CONTEXT_MAX_USER_PRIORITY	1023
 #define LOCAL_I915_CONTEXT_DEFAULT_PRIORITY	0
lib/igt_gt.c +19 -19
index 89727d22dd5c..64a2dfd62da7 100644
@@ -126,15 +126,15 @@ void igt_require_hang_ring(int fd, int ring)
 
 static unsigned context_get_ban(int fd, unsigned ctx)
 {
-	struct local_i915_gem_context_param param;
+	struct drm_i915_gem_context_param param;
 
-	param.param = LOCAL_CONTEXT_PARAM_BANNABLE;
+	param.param = I915_CONTEXT_PARAM_BANNABLE;
 	param.value = 0;
 	param.size = 0;
 
 	if (__gem_context_get_param(fd, &param) == -EINVAL) {
 		igt_assert(param.value == 0);
-		param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD;
+		param.param = I915_CONTEXT_PARAM_BAN_PERIOD;
 		gem_context_get_param(fd, &param);
 	}
 
@@ -143,24 +143,24 @@ static unsigned context_get_ban(int fd, unsigned ctx)
 
 static void context_set_ban(int fd, unsigned ctx, unsigned ban)
 {
-	struct local_i915_gem_context_param param;
+	struct drm_i915_gem_context_param param;
 
 	memset(&param, 0, sizeof(param));
-	param.context = ctx;
+	param.ctx_id = ctx;
 	param.value = ban;
 	param.size = 0;
-	param.param = LOCAL_CONTEXT_PARAM_BANNABLE;
+	param.param = I915_CONTEXT_PARAM_BANNABLE;
 
 	if(__gem_context_set_param(fd, &param) == -EINVAL) {
 		igt_assert(param.value == ban);
-		param.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD;
+		param.param = I915_CONTEXT_PARAM_BAN_PERIOD;
 		gem_context_set_param(fd, &param);
 	}
 }
 
 igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 {
-	struct local_i915_gem_context_param param;
+	struct drm_i915_gem_context_param param;
 	unsigned ban;
 
 	igt_assert(igt_sysfs_set_parameter
@@ -172,11 +172,11 @@ igt_hang_t igt_allow_hang(int fd, unsigned ctx, unsigned flags)
 	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
 		igt_require(has_gpu_reset(fd));
 
-	param.context = ctx;
+	param.ctx_id = ctx;
 	param.size = 0;
 
 	if ((flags & HANG_ALLOW_CAPTURE) == 0) {
-		param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE;
+		param.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE;
 		param.value = 1;
 		/* Older kernels may not have NO_ERROR_CAPTURE, in which case
 		 * we just eat the error state in post-hang (and hope we eat
@@ -198,9 +198,9 @@ void igt_disallow_hang(int fd, igt_hang_t arg)
 	context_set_ban(fd, arg.ctx, arg.ban);
 
 	if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) {
-		struct local_i915_gem_context_param param = {
-			.context = arg.ctx,
-			.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE,
+		struct drm_i915_gem_context_param param = {
+			.ctx_id = arg.ctx,
+			.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE,
 			.value = 0,
 		};
 		__gem_context_set_param(fd, &param);
@@ -272,7 +272,7 @@ igt_hang_t igt_hang_ctx(int fd,
 	struct drm_i915_gem_relocation_entry reloc;
 	struct drm_i915_gem_execbuffer2 execbuf;
 	struct drm_i915_gem_exec_object2 exec;
-	struct local_i915_gem_context_param param;
+	struct drm_i915_gem_context_param param;
 	uint32_t b[16];
 	unsigned ban;
 	unsigned len;
@@ -282,11 +282,11 @@ igt_hang_t igt_hang_ctx(int fd,
 	/* check if non-default ctx submission is allowed */
 	igt_require(ctx == 0 || has_ctx_exec(fd, ring, ctx));
 
-	param.context = ctx;
+	param.ctx_id = ctx;
 	param.size = 0;
 
 	if ((flags & HANG_ALLOW_CAPTURE) == 0) {
-		param.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE;
+		param.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE;
 		param.value = 1;
 		/* Older kernels may not have NO_ERROR_CAPTURE, in which case
 		 * we just eat the error state in post-hang (and hope we eat
@@ -371,9 +371,9 @@ void igt_post_hang_ring(int fd, igt_hang_t arg)
 	context_set_ban(fd, arg.ctx, arg.ban);
 
 	if ((arg.flags & HANG_ALLOW_CAPTURE) == 0) {
-		struct local_i915_gem_context_param param = {
-			.context = arg.ctx,
-			.param = LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE,
+		struct drm_i915_gem_context_param param = {
+			.ctx_id = arg.ctx,
+			.param = I915_CONTEXT_PARAM_NO_ERROR_CAPTURE,
 			.value = 0,
 		};
 		__gem_context_set_param(fd, &param);
lib/ioctl_wrappers.c +19 -48

203 lines not on this page · raw message

tests/Makefile.am +2 -1
index 27acfb358582..36f7d7a0b10a 100644
@@ -84,7 +84,7 @@ EXTRA_DIST = \
 
 CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
 
-AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
+AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
 	-I$(top_srcdir)/include/drm-uapi \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../lib \
@@ -92,6 +92,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
 	-DIGT_SRCDIR=\""$(abs_srcdir)"\" \
 	-DIGT_DATADIR=\""$(pkgdatadir)"\" \
 	-D_GNU_SOURCE \
+	$(DRM_CFLAGS) \
 	$(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \
 	$(NULL)
 
tests/gem_ctx_param.c +19 -19
index efdaf191a1ed..c20ae1eefea1 100644
@@ -30,7 +30,7 @@ IGT_TEST_DESCRIPTION("Basic test for context set/get param input validation.");
 
 igt_main
 {
-	struct local_i915_gem_context_param arg;
+	struct drm_i915_gem_context_param arg;
 	int fd;
 	uint32_t ctx;
 
@@ -41,46 +41,46 @@ igt_main
 		ctx = gem_context_create(fd);
 	}
 
-	arg.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD;
+	arg.param = I915_CONTEXT_PARAM_BAN_PERIOD;
 
 	/* XXX start to enforce ban period returning -EINVAL when
 	 * transition has been done */
 	if (__gem_context_get_param(fd, &arg) == -EINVAL)
-		arg.param = LOCAL_CONTEXT_PARAM_BANNABLE;
+		arg.param = I915_CONTEXT_PARAM_BANNABLE;
 
 	igt_subtest("basic") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
 		gem_context_set_param(fd, &arg);
 	}
 
 	igt_subtest("basic-default") {
-		arg.context = 0;
+		arg.ctx_id = 0;
 		gem_context_get_param(fd, &arg);
 		gem_context_set_param(fd, &arg);
 	}
 
 	igt_subtest("invalid-ctx-get") {
-		arg.context = 2;
+		arg.ctx_id = 2;
 		igt_assert_eq(__gem_context_get_param(fd, &arg), -ENOENT);
 	}
 
 	igt_subtest("invalid-ctx-set") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
-		arg.context = 2;
+		arg.ctx_id = 2;
 		igt_assert_eq(__gem_context_set_param(fd, &arg), -ENOENT);
 	}
 
 	igt_subtest("invalid-size-get") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		arg.size = 8;
 		gem_context_get_param(fd, &arg);
 		igt_assert(arg.size == 0);
 	}
 
 	igt_subtest("invalid-size-set") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
 		arg.size = 8;
 		igt_assert_eq(__gem_context_set_param(fd, &arg), -EINVAL);
@@ -91,7 +91,7 @@ igt_main
 		igt_fork(child, 1) {
 			igt_drop_root();
 
-			arg.context = ctx;
+			arg.ctx_id = ctx;
 			gem_context_get_param(fd, &arg);
 			arg.value--;
 			igt_assert_eq(__gem_context_set_param(fd, &arg), -EPERM);
@@ -101,19 +101,19 @@ igt_main
 	}
 
 	igt_subtest("root-set") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
 		arg.value--;
 		gem_context_set_param(fd, &arg);
 	}
 
-	arg.param = LOCAL_CONTEXT_PARAM_NO_ZEROMAP;
+	arg.param = I915_CONTEXT_PARAM_NO_ZEROMAP;
 
 	igt_subtest("non-root-set-no-zeromap") {
 		igt_fork(child, 1) {
 			igt_drop_root();
 
-			arg.context = ctx;
+			arg.ctx_id = ctx;
 			gem_context_get_param(fd, &arg);
 			arg.value--;
 			gem_context_set_param(fd, &arg);
@@ -123,14 +123,14 @@ igt_main
 	}
 
 	igt_subtest("root-set-no-zeromap-enabled") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
 		arg.value = 1;
 		gem_context_set_param(fd, &arg);
 	}
 
 	igt_subtest("root-set-no-zeromap-disabled") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		gem_context_get_param(fd, &arg);
 		arg.value = 0;
 		gem_context_set_param(fd, &arg);
@@ -140,15 +140,15 @@ igt_main
 	 * to catch ABI extensions. Don't "fix" this testcase without adding all
 	 * the tests for the new param first.
 	 */
-	arg.param = LOCAL_CONTEXT_PARAM_BANNABLE + 1;
+	arg.param = I915_CONTEXT_PARAM_BANNABLE + 1;
 
 	igt_subtest("invalid-param-get") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		igt_assert_eq(__gem_context_get_param(fd, &arg), -EINVAL);
 	}
 
 	igt_subtest("invalid-param-set") {
-		arg.context = ctx;
+		arg.ctx_id = ctx;
 		igt_assert_eq(__gem_context_set_param(fd, &arg), -EINVAL);
 	}
 
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

✓ Fi.CI.BAT: success for Import drm UAPI headers.

In reply to Eric Anholt
== Series Details ==

== Series Details ==

Series: Import drm UAPI headers.
URL : https://patchwork.freedesktop.org/series/33635/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 7d75119b7f23fb49af52463da9bcd62e64fe6a6f lib: Always enable ftrace-dump-on-oops

with latest DRM-Tip kernel build CI_DRM_3332
1342299348de drm-tip: 2017y-11m-10d-18h-11m-22s UTC integration manifest

No testlist changes.

Test gem_exec_reloc:

        Subgroup basic-gtt-read-active:
                fail       -> PASS       (fi-gdg-551) fdo#102582

fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:456s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:380s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:542s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:278s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:506s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:504s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:500s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:500s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:427s
fi-gdg-551       total:289  pass:178  dwarn:1   dfail:0   fail:1   skip:109 time:263s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:537s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:435s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:443s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:430s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:487s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:460s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:487s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:518s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:483s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:542s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:457s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:547s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:560s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:526s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:499s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:461s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:566s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:434s
Blacklisted hosts:
fi-cfl-s         total:289  pass:254  dwarn:3   dfail:0   fail:0   skip:32  time:536s
fi-cnl-y         total:289  pass:261  dwarn:0   dfail:0   fail:1   skip:27  time:550s
fi-glk-dsi       total:289  pass:132  dwarn:0   dfail:10  fail:2   skip:145 time:307s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_491/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

✗ Fi.CI.IGT: warning for Import drm UAPI headers.

In reply to Eric Anholt
== Series Details ==

== Series Details ==

Series: Import drm UAPI headers.
URL : https://patchwork.freedesktop.org/series/33635/
State : warning

== Summary ==

Test gem_softpin:

        Subgroup noreloc-s4:
                dmesg-fail -> FAIL       (shard-hsw) fdo#103375
Test drv_module_reload:
        Subgroup basic-reload-inject:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test kms_setmode:
        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test kms_busy:
        Subgroup extended-modeset-hang-newfb-with-reset-render-b:
                dmesg-warn -> PASS       (shard-hsw) fdo#103038
        Subgroup extended-modeset-hang-newfb-with-reset-render-c:
                dmesg-warn -> PASS       (shard-hsw) fdo#102249
Test kms_cursor_legacy:
        Subgroup cursor-vs-flip-atomic:
                pass       -> SKIP       (shard-hsw)
Test kms_flip:
        Subgroup plain-flip-fb-recreate-interruptible:
                pass       -> FAIL       (shard-hsw) fdo#100368

fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#103038 https://bugs.freedesktop.org/show_bug.cgi?id=103038
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368

shard-hsw total:2584 pass:1470 dwarn:3 dfail:1 fail:10 skip:1100 time:9445s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_491/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on the v1 series
#11 lore raw
In reply to Eric Anholt

Hey Eric,

Like it did for Mesa I think this makes developers' lives easier.
Not having to update libdrm and then compile against the right version just for the kernel headers you need is a win (in my opinion).

Looking forward to get this merged!

If most developers agree with the overall goal, patch 1 is :

-
Lionel

Quoted 73 lines · Eric Anholt

This series imports the UAPI headers from Linux, like we've been doing in Mesa for vc4 and i965. The advantage is that it lets you build new kernel UAPI and testcases together, without needing libdrm releases, and has a simple rule for producing header updates (avoiding the need for the LOCAL_* define hacks that have been proliferating in the tree)

I started on converting i915 to not use LOCAL_*, but it's more than I'm willing to complete.

Eric Anholt (5):
headers: Import drm-next uapi headers.
tests: Convert to using the imported drm-uapi headers.
tests: Remove libdrm_vc4 dependency.
lib: Use the imported uapi's addfb2 defines.
lib: Use drm-uapi/i915_drm.h instead of local defines.

  README                         |    8 +
  benchmarks/Makefile.am         |    6 +-
  benchmarks/gem_wsim.c          |    6 +-
  configure.ac                   |   12 +-
  include/drm-uapi/amdgpu_drm.h  |  930 ++++++++++++++++++++++++
  include/drm-uapi/armada_drm.h  |   55 ++
  include/drm-uapi/drm.h         |  988 +++++++++++++++++++++++++
  include/drm-uapi/drm_fourcc.h  |  410 +++++++++++
  include/drm-uapi/drm_mode.h    |  855 ++++++++++++++++++++++
  include/drm-uapi/drm_sarea.h   |   92 +++
  include/drm-uapi/etnaviv_drm.h |  282 ++++++++
  include/drm-uapi/exynos_drm.h  |  373 ++++++++++
  include/drm-uapi/i810_drm.h    |  291 ++++++++
  include/drm-uapi/i915_drm.h    | 1542 ++++++++++++++++++++++++++++++++++++++++
  include/drm-uapi/mga_drm.h     |  427 +++++++++++
  include/drm-uapi/msm_drm.h     |  306 ++++++++
  include/drm-uapi/nouveau_drm.h |  152 ++++
  include/drm-uapi/omap_drm.h    |  125 ++++
  include/drm-uapi/qxl_drm.h     |  158 ++++
  include/drm-uapi/r128_drm.h    |  336 +++++++++
  include/drm-uapi/radeon_drm.h  | 1078 ++++++++++++++++++++++++++++
  include/drm-uapi/savage_drm.h  |  220 ++++++
  include/drm-uapi/sis_drm.h     |   77 ++
  include/drm-uapi/tegra_drm.h   |  209 ++++++
  include/drm-uapi/vc4_drm.h     |  359 ++++++++++
  include/drm-uapi/vgem_drm.h    |   62 ++
  include/drm-uapi/via_drm.h     |  282 ++++++++
  include/drm-uapi/virtgpu_drm.h |  174 +++++
  include/drm-uapi/vmwgfx_drm.h  | 1128 +++++++++++++++++++++++++++++
  lib/Makefile.am                |    7 +-
  lib/i915/gem_context.c         |   46 +-
  lib/i915/gem_context.h         |   19 +-
  lib/igt_gt.c                   |   38 +-
  lib/ioctl_wrappers.c           |   71 +-
  lib/meson.build                |    6 +-
  meson.build                    |    3 +-
  tests/Makefile.am              |   16 +-
  tests/gem_ctx_param.c          |   38 +-
  tests/meson.build              |   16 +-
  39 files changed, 11032 insertions(+), 171 deletions(-)

create mode 100644 include/drm-uapi/amdgpu_drm.h create mode 100644 include/drm-uapi/armada_drm.h create mode 100644 include/drm-uapi/drm.h create mode 100644 include/drm-uapi/drm_fourcc.h create mode 100644 include/drm-uapi/drm_mode.h create mode 100644 include/drm-uapi/drm_sarea.h create mode 100644 include/drm-uapi/etnaviv_drm.h create mode 100644 include/drm-uapi/exynos_drm.h create mode 100644 include/drm-uapi/i810_drm.h create mode 100644 include/drm-uapi/i915_drm.h create mode 100644 include/drm-uapi/mga_drm.h create mode 100644 include/drm-uapi/msm_drm.h create mode 100644 include/drm-uapi/nouveau_drm.h create mode 100644 include/drm-uapi/omap_drm.h create mode 100644 include/drm-uapi/qxl_drm.h create mode 100644 include/drm-uapi/r128_drm.h create mode 100644 include/drm-uapi/radeon_drm.h

Quoted 9 lines

create mode 100644 include/drm-uapi/savage_drm.h create mode 100644 include/drm-uapi/sis_drm.h create mode 100644 include/drm-uapi/tegra_drm.h create mode 100644 include/drm-uapi/vc4_drm.h create mode 100644 include/drm-uapi/vgem_drm.h create mode 100644 include/drm-uapi/via_drm.h create mode 100644 include/drm-uapi/virtgpu_drm.h create mode 100644 include/drm-uapi/vmwgfx_drm.h

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by
#12 lore raw
Quoted 5 lines · Lionel Landwerlin

Hey Eric,

Like it did for Mesa I think this makes developers' lives easier. Not having to update libdrm and then compile against the right version just for the kernel headers you need is a win (in my opinion).

Yes indeed. Would be nice to be able to build IGT on Debian stable again.

Series is

Some more acks (or objections, if any) for the overall idea would be nice to have, after that we can merge this and start cleaning up the LOCAL_* crud.

Signature · 5 lines
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Acked-by
#13 lore raw
Quoted 10 lines · Petri Latvala
Quoted 5 lines · Lionel Landwerlin

Hey Eric,

Like it did for Mesa I think this makes developers' lives easier. Not having to update libdrm and then compile against the right version just for the kernel headers you need is a win (in my opinion).

Yes indeed. Would be nice to be able to build IGT on Debian stable again.

Quoted 7 lines

Series is

Some more acks (or objections, if any) for the overall idea would be nice to have, after that we can merge this and start cleaning up the LOCAL_* crud.

fwiw I like the idea of just importing the headers, avoids all the need for _local versions. Of course we need to make sure we don't add stuff that isn't upstream, usually uapi merging rules apply (i.e. merge kernel, then merge userspace, how to CI tbh).

-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw
In reply to Petri Latvala
Quoted 10 lines · Petri Latvala
Quoted 5 lines · Lionel Landwerlin

Hey Eric,

Like it did for Mesa I think this makes developers' lives easier. Not having to update libdrm and then compile against the right version just for the kernel headers you need is a win (in my opinion).

Yes indeed. Would be nice to be able to build IGT on Debian stable again.

Quoted 7 lines

Series is

Some more acks (or objections, if any) for the overall idea would be nice to have, after that we can merge this and start cleaning up the LOCAL_* crud.

Is there anyone else who is likely to give feedback on this?

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw
Quoted 14 lines · Eric Anholt
Quoted 12 lines · Petri Latvala
Quoted 5 lines · Lionel Landwerlin

Hey Eric,

Like it did for Mesa I think this makes developers' lives easier. Not having to update libdrm and then compile against the right version just for the kernel headers you need is a win (in my opinion).

Yes indeed. Would be nice to be able to build IGT on Debian stable again.

Series is

Quoted 7 lines
Quoted 5 lines

Some more acks (or objections, if any) for the overall idea would be nice to have, after that we can merge this and start cleaning up the LOCAL_* crud.

Is there anyone else who is likely to give feedback on this?

I pinged Arek, but I think it's good to go otherwise. -Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx