* [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel.
@ 2016-06-23 9:34 robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
` (13 more replies)
0 siblings, 14 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Hey,
I've been looking at the possibilty of removing the compile time depency on
libdrm_intel. There are two technical solutions to this problem as far as
I can see; stubs and conditional compilation.
This series uses the stubbing approach.
Changes since v1:
- Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
- Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
- Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
- Replaced igt_require with igt_require_f to communicate stubs being the cause
of failure.
- Rename intel_drm_stubs to intel_bufmgr.
- Moved intel_bufmgr to lib/stubs/drm.
- Remove header inclusion changes in favor for inclusion of stubs in
lib/stubs/drm using build scripts.
- Rebased on trunk.
Changes since v2:
- Removed conditional compilation from intel_bufmgr.h.
- Enable HAVE_LIBDRM_INTEL on android platforms.
- Remove unnecessary whitespace.
- Remove unnecessary inclusion of C files.
- De-duplicated intel_bufmgr.c error string.
- Changed Makefile.sources variable names to be non-automake specific
Changes since v3:
- Added signoff to two commits.
- Changed automake if not statement.
- Removed accidental space character.
- Copied in new copy of intel_bufmgr.h
- Improved wording of lib/stubs/drm/README.
Robert Foss (13):
configure.ac: Test for libdrm_intel and build for it if present.
configure.ac: Harmonize HAVE_XXX flag for all drm platforms to
HAVE_LIBDRM_XXX.
Enable HAVE_LIBDRM_INTEL unconditionally for Android.
benchmarks/Makefile: Don't build benchmarks that depend on
libdrm_intel.
tools/Makefile: Don't build tools that depend on libdrm_intel.
tools/Makefile: Format whitespace.
demos/Makefile: Don't build tools that depend on libdrm_intel.
lib/stubs: Add stubs for intel_bufmgr.
demos/Makefile: Replace automake specific name of listing in
Makfile.sources
benchmarks/Makefile: Replace automake specific name of listing in
Makfile.sources
tools/Makefile: Replace automake specific name of listings in
Makfile.sources
lib/tests/Makefile: Replace automake specific names of listings in
Makefile.sources
lib/Makefile: Replace automake specific names of listings in
Makefile.sources
Android.mk | 2 +
benchmarks/Android.mk | 6 +-
benchmarks/Makefile.am | 7 +-
benchmarks/Makefile.sources | 15 +-
configure.ac | 25 +++-
demos/Android.mk | 5 +-
demos/Makefile.am | 10 +-
demos/Makefile.sources | 7 +
lib/Android.mk | 2 +-
lib/Makefile.am | 10 +-
lib/Makefile.sources | 2 +-
lib/stubs/drm/README | 4 +
lib/stubs/drm/intel_bufmgr.c | 269 ++++++++++++++++++++++++++++++++++++
lib/stubs/drm/intel_bufmgr.h | 321 +++++++++++++++++++++++++++++++++++++++++++
lib/tests/Android.mk | 2 +-
lib/tests/Makefile.am | 3 +
lib/tests/Makefile.sources | 8 +-
tests/Makefile.am | 4 +-
tools/Android.mk | 6 +
tools/Makefile.am | 7 +
tools/Makefile.sources | 73 +++++-----
21 files changed, 723 insertions(+), 65 deletions(-)
create mode 100644 demos/Makefile.sources
create mode 100644 lib/stubs/drm/README
create mode 100644 lib/stubs/drm/intel_bufmgr.c
create mode 100644 lib/stubs/drm/intel_bufmgr.h
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Test for libdrm_intel and build for it if present.
Also expose the HAVE_INTEL #define to allow code to be conditionally
compiled.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
configure.ac | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 0405c8b..49903e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ if test "x$GCC" = "xyes"; then
fi
AC_SUBST(ASSEMBLER_WARN_CFLAGS)
-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.64 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
case "$target_cpu" in
@@ -150,6 +150,21 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
# -----------------------------------------------------------------------------
# Configuration options
# -----------------------------------------------------------------------------
+AC_ARG_ENABLE(intel, AS_HELP_STRING([--disable-intel],
+ [Enable building of intel specific parts (default: auto)]),
+ [INTEL=$enableval], [INTEL=auto])
+if test "x$INTEL" = xauto; then
+ PKG_CHECK_EXISTS([libdrm_intel >= 2.4.64], [INTEL=yes], [INTEL=no])
+fi
+if test "x$INTEL" = xyes; then
+ PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.64])
+ AC_DEFINE(HAVE_LIBDRM_INTEL, 1, [Have intel support])
+else
+ DRM_INTEL_CFLAGS=$(top_srcdir)/lib/stubs/drm/
+ AC_SUBST([DRM_INTEL_CFLAGS])
+fi
+AM_CONDITIONAL(HAVE_LIBDRM_INTEL, [test "x$INTEL" = xyes])
+
# for dma-buf tests
AC_ARG_ENABLE(nouveau, AS_HELP_STRING([--disable-nouveau],
[Enable use of nouveau API for prime tests (default: auto)]),
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android robert.foss
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake flag HAVE_XXX for VC4/NOUVEAU with HAVE_LIBDRM_XXX in
order for the flags to be more descriptive and also follow the same convention
as HAVE_LIBDRM_INTEL.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
configure.ac | 8 ++++----
lib/Makefile.am | 2 +-
tests/Makefile.am | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 49903e4..a6210ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,9 +174,9 @@ if test "x$NOUVEAU" = xauto; then
fi
if test "x$NOUVEAU" = xyes; then
PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
- AC_DEFINE(HAVE_NOUVEAU, 1, [Have nouveau support])
+ AC_DEFINE(HAVE_LIBDRM_NOUVEAU, 1, [Have nouveau support])
fi
-AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
+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)]),
@@ -186,9 +186,9 @@ if test "x$VC4" = xauto; then
fi
if test "x$VC4" = xyes; then
PKG_CHECK_MODULES(DRM_VC4, [libdrm_vc4])
- AC_DEFINE(HAVE_VC4, 1, [Have vc4 support])
+ AC_DEFINE(HAVE_LIBDRM_VC4, 1, [Have vc4 support])
fi
-AM_CONDITIONAL(HAVE_VC4, [test "x$VC4" = xyes])
+AM_CONDITIONAL(HAVE_LIBDRM_VC4, [test "x$VC4" = xyes])
# Define a configure option for the shader debugger
AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d2f2e16..d2ae98d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,7 +8,7 @@ include Makefile.sources
noinst_LTLIBRARIES = libintel_tools.la
noinst_HEADERS = check-ndebug.h
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
libintel_tools_la_SOURCES += \
igt_vc4.c \
igt_vc4.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2c2025..737afbe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
include Makefile.sources
-if HAVE_NOUVEAU
+if HAVE_LIBDRM_NOUVEAU
TESTS_progs_M += $(NOUVEAU_TESTS_M)
endif
-if HAVE_VC4
+if HAVE_LIBDRM_VC4
TESTS_progs_M += $(VC4_TESTS_M)
endif
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Always set HAVE_LIBDRM_INTEL to true for Android targets.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
Android.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Android.mk b/Android.mk
index 681d114..3690fc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,4 @@
+HAVE_LIBDRM_INTEL := true
+
include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (2 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 05/13] tools/Makefile: Don't build tools " robert.foss
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Use the HAS_INTEL automake flag to avoid building benchmarks that won't
compile unless libdrm_intel is available in the build system.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
benchmarks/Android.mk | 4 ++++
benchmarks/Makefile.am | 5 ++++-
benchmarks/Makefile.sources | 13 ++++++++-----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 207a177..22ecd2f 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -34,4 +34,8 @@ endef
benchmark_list := $(benchmarks_PROGRAMS)
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+ benchmark_list += $(LIBDRM_INTEL_BENCHMARKS)
+endif
+
$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 49d2f64..7400dd0 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,6 +1,9 @@
-
include Makefile.sources
+if HAVE_LIBDRM_INTEL
+ benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
+endif
+
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
$(WERROR_CFLAGS)
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
index bc4f2b5..5804d3b 100644
--- a/benchmarks/Makefile.sources
+++ b/benchmarks/Makefile.sources
@@ -1,10 +1,6 @@
benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks
benchmarks_PROGRAMS = \
- intel_upload_blit_large \
- intel_upload_blit_large_gtt \
- intel_upload_blit_large_map \
- intel_upload_blit_small \
gem_blt \
gem_create \
gem_exec_ctx \
@@ -17,6 +13,13 @@ benchmarks_PROGRAMS = \
gem_prw \
gem_set_domain \
gem_syslatency \
- gem_userptr_benchmark \
kms_vblank \
$(NULL)
+
+LIBDRM_INTEL_BENCHMARKS = \
+ intel_upload_blit_large \
+ intel_upload_blit_large_gtt \
+ intel_upload_blit_large_map \
+ intel_upload_blit_small \
+ gem_userptr_benchmark \
+ $(NULL)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 05/13] tools/Makefile: Don't build tools that depend on libdrm_intel.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (3 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 06/13] tools/Makefile: Format whitespace robert.foss
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Use the HAS_INTEL automake flag to avoid building tools that won't
compile unless libdrm_intel is available in the build system.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
tools/Android.mk | 5 +++++
tools/Makefile.am | 5 +++++
tools/Makefile.sources | 16 ++++++----------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/tools/Android.mk b/tools/Android.mk
index 5f64184..306a4b5 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -67,6 +67,11 @@ ifneq ("${ANDROID_HAS_CAIRO}", "1")
skip_tools_list += intel_residency
endif
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+ bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+ intel_error_decode_LDFLAGS = -lz
+endif
+
tools_list := $(filter-out $(skip_tools_list),$(bin_PROGRAMS))
$(foreach item,$(tools_list),$(eval $(call add_tool,$(item))))
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5f45144..f8ac0d8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,10 @@
include Makefile.sources
+if HAVE_LIBDRM_INTEL
+ bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+ intel_error_decode_LDFLAGS = -lz
+endif
+
SUBDIRS = null_state_gen registers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 5d5958d..07d8d9b 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -13,11 +13,8 @@ bin_PROGRAMS = \
intel_bios_reader \
intel_display_crc \
intel_display_poller \
- intel_dump_decode \
- intel_error_decode \
intel_forcewaked \
intel_gpu_frequency \
- intel_framebuffer_dump \
intel_firmware_decode \
intel_gpu_time \
intel_gpu_top \
@@ -27,7 +24,6 @@ bin_PROGRAMS = \
intel_lid \
intel_opregion_decode \
intel_panel_fitter \
- intel_perf_counters \
intel_reg_checker \
intel_residency \
intel_stepping \
@@ -35,8 +31,12 @@ bin_PROGRAMS = \
dist_bin_SCRIPTS = intel_gpu_abrt
-intel_dump_decode_SOURCES = \
- intel_dump_decode.c
+LIBDRM_INTEL_BIN = \
+ intel_dump_decode \
+ intel_error_decode \
+ intel_framebuffer_dump \
+ intel_perf_counters \
+ $(NULL)
intel_reg_SOURCES = \
intel_reg.c \
@@ -44,10 +44,6 @@ intel_reg_SOURCES = \
intel_reg_spec.c \
intel_reg_spec.h
-intel_error_decode_SOURCES = \
- intel_error_decode.c
-intel_error_decode_LDFLAGS = -lz
-
intel_bios_reader_SOURCES = \
intel_bios_reader.c \
intel_bios.h
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 06/13] tools/Makefile: Format whitespace.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (4 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 05/13] tools/Makefile: Don't build tools " robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel robert.foss
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Harmonize tabs/spaces etc.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
tools/Makefile.sources | 57 +++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 07d8d9b..7ed5fe5 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -1,33 +1,34 @@
-noinst_PROGRAMS = \
- hsw_compute_wrpll \
- skl_compute_wrpll \
- skl_ddb_allocation \
+noinst_PROGRAMS = \
+ hsw_compute_wrpll \
+ skl_compute_wrpll \
+ skl_ddb_allocation \
$(NULL)
-bin_PROGRAMS = \
- igt_stats \
- intel_audio_dump \
- intel_reg \
- intel_backlight \
- intel_bios_dumper \
- intel_bios_reader \
- intel_display_crc \
- intel_display_poller \
- intel_forcewaked \
- intel_gpu_frequency \
- intel_firmware_decode \
- intel_gpu_time \
- intel_gpu_top \
- intel_gtt \
- intel_infoframes \
- intel_l3_parity \
- intel_lid \
- intel_opregion_decode \
- intel_panel_fitter \
- intel_reg_checker \
- intel_residency \
- intel_stepping \
- intel_watermark
+bin_PROGRAMS = \
+ igt_stats \
+ intel_audio_dump \
+ intel_reg \
+ intel_backlight \
+ intel_bios_dumper \
+ intel_bios_reader \
+ intel_display_crc \
+ intel_display_poller \
+ intel_forcewaked \
+ intel_gpu_frequency \
+ intel_firmware_decode \
+ intel_gpu_time \
+ intel_gpu_top \
+ intel_gtt \
+ intel_infoframes \
+ intel_l3_parity \
+ intel_lid \
+ intel_opregion_decode \
+ intel_panel_fitter \
+ intel_reg_checker \
+ intel_residency \
+ intel_stepping \
+ intel_watermark \
+ $(NULL)
dist_bin_SCRIPTS = intel_gpu_abrt
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (5 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 06/13] tools/Makefile: Format whitespace robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 08/13] lib/stubs: Add stubs for intel_bufmgr robert.foss
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Use the HAS_INTEL automake flag to avoid building tools that won't
compile unless libdrm_intel is available in the build system.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
demos/Android.mk | 5 ++++-
demos/Makefile.am | 8 +++++---
demos/Makefile.sources | 7 +++++++
3 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 demos/Makefile.sources
diff --git a/demos/Android.mk b/demos/Android.mk
index 7d06c9a..add2414 100644
--- a/demos/Android.mk
+++ b/demos/Android.mk
@@ -4,8 +4,11 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := intel_sprite_on.c
+LOCAL_SRC_FILES :=
+ifeq ($(HAVE_LIBDRM_INTEL),true)
+ LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
+endif
LOCAL_CFLAGS += -DHAVE_TERMIOS_H
LOCAL_CFLAGS += -DANDROID -UNDEBUG
diff --git a/demos/Makefile.am b/demos/Makefile.am
index f5725f4..48eb6c2 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,6 +1,8 @@
-bin_PROGRAMS = \
- intel_sprite_on \
- $(NULL)
+include Makefile.sources
+
+if HAVE_LIBDRM_INTEL
+ bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
+endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
diff --git a/demos/Makefile.sources b/demos/Makefile.sources
new file mode 100644
index 0000000..302f6d9
--- /dev/null
+++ b/demos/Makefile.sources
@@ -0,0 +1,7 @@
+bin_PROGRAMS = \
+ $(NULL)
+
+HAVE_LIBDRM_INTEL_BIN = \
+ intel_sprite_on \
+ $(NULL)
+
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 08/13] lib/stubs: Add stubs for intel_bufmgr.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (6 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources robert.foss
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
This patch provides stubs for functionality otherwise provided by intel_bufmgr.
The stubbed functions all fail with a call to igt_require_f(false,"").
Defines and enums have been copied from libdrm_intel.
Due to the stubbed tests failing with an igt_require_f() call, these stubs are
not well suited for non-tests, since tools/benchmarks/etc 'skipping'
execution is unhelpful.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
lib/Makefile.am | 6 +
lib/stubs/drm/README | 4 +
lib/stubs/drm/intel_bufmgr.c | 269 ++++++++++++++++++++++++++++++++++++
lib/stubs/drm/intel_bufmgr.h | 321 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 600 insertions(+)
create mode 100644 lib/stubs/drm/README
create mode 100644 lib/stubs/drm/intel_bufmgr.c
create mode 100644 lib/stubs/drm/intel_bufmgr.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d2ae98d..365d7d9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,6 +14,12 @@ if HAVE_LIBDRM_VC4
igt_vc4.h
endif
+if !HAVE_LIBDRM_INTEL
+ libintel_tools_la_SOURCES += \
+ stubs/drm/intel_bufmgr.c \
+ stubs/drm/intel_bufmgr.h
+endif
+
AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = $(CWARNFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(LIBUNWIND_CFLAGS) $(DEBUG_CFLAGS) \
-DIGT_SRCDIR=\""$(abs_top_srcdir)/tests"\" \
diff --git a/lib/stubs/drm/README b/lib/stubs/drm/README
new file mode 100644
index 0000000..79f2b5f
--- /dev/null
+++ b/lib/stubs/drm/README
@@ -0,0 +1,4 @@
+intel_bufmgr.h is a local copy of the file provided by libdrm (intel/intel_bufmgr.h).
+
+Before releasing i-g-t a current copy of intel_bufmgr.h should be copied into
+this directory of i-g-t.
diff --git a/lib/stubs/drm/intel_bufmgr.c b/lib/stubs/drm/intel_bufmgr.c
new file mode 100644
index 0000000..bc1c196
--- /dev/null
+++ b/lib/stubs/drm/intel_bufmgr.c
@@ -0,0 +1,269 @@
+#include <stdbool.h>
+
+#include "igt_core.h"
+#include "intel_bufmgr.h"
+
+const char * const missing_support_str = "Not compiled with libdrm_intel support\n";
+
+drm_intel_bufmgr *drm_intel_bufmgr_gem_init(int fd, int batch_size)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bufmgr *) NULL;
+}
+
+void drm_intel_bo_unreference(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+drm_intel_bo *drm_intel_bo_alloc(drm_intel_bufmgr *bufmgr, const char *name,
+ unsigned long size, unsigned int alignment)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+int drm_intel_bo_subdata(drm_intel_bo *bo, unsigned long offset,
+ unsigned long size, const void *data)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx,
+ int used, unsigned int flags)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
+ drm_intel_bo *target_bo, uint32_t target_offset,
+ uint32_t read_domains, uint32_t write_domain)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_emit_reloc_fence(drm_intel_bo *bo, uint32_t offset,
+ drm_intel_bo *target_bo,
+ uint32_t target_offset,
+ uint32_t read_domains, uint32_t write_domain)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_get_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+ uint32_t * swizzle_mode)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
+ struct drm_clip_rect *cliprects, int num_cliprects,
+ int DR4, unsigned int flags)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+void drm_intel_bufmgr_gem_set_aub_annotations(drm_intel_bo *bo,
+ drm_intel_aub_annotation *annotations,
+ unsigned count)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+void drm_intel_bufmgr_gem_enable_reuse(drm_intel_bufmgr *bufmgr)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_bo_exec(drm_intel_bo *bo, int used,
+ struct drm_clip_rect *cliprects, int num_cliprects, int DR4)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+void drm_intel_bufmgr_destroy(drm_intel_bufmgr *bufmgr)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+void drm_intel_bo_wait_rendering(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_bo_get_subdata(drm_intel_bo *bo, unsigned long offset,
+ unsigned long size, void *data)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_map(drm_intel_bo *bo, int write_enable)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+void drm_intel_bufmgr_gem_enable_fenced_relocs(drm_intel_bufmgr *bufmgr)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_bo_unmap(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_flink(drm_intel_bo *bo, uint32_t * name)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+drm_intel_bo *drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ unsigned int handle)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+int drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+drm_intel_bo *drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr,
+ int prime_fd, int size)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+void drm_intel_bufmgr_gem_set_vma_cache_size(drm_intel_bufmgr *bufmgr,
+ int limit)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+drm_intel_context *drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+void drm_intel_gem_context_destroy(drm_intel_context *ctx)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+drm_intel_bo *drm_intel_bo_alloc_tiled(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ int x, int y, int cpp,
+ uint32_t *tiling_mode,
+ unsigned long *pitch,
+ unsigned long flags)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+void drm_intel_bufmgr_gem_set_aub_filename(drm_intel_bufmgr *bufmgr,
+ const char *filename)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+void drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+void drm_intel_gem_bo_aub_dump_bmp(drm_intel_bo *bo,
+ int x1, int y1, int width, int height,
+ enum aub_dump_bmp_format format,
+ int pitch, int offset)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+void drm_intel_gem_bo_start_gtt_access(drm_intel_bo *bo, int write_enable)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+ uint32_t stride)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_bo_disable_reuse(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+void drm_intel_bo_reference(drm_intel_bo *bo)
+{
+ igt_require_f(false, missing_support_str);
+}
+
+int drm_intel_bufmgr_gem_get_devid(drm_intel_bufmgr *bufmgr)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+drm_intel_bo *drm_intel_bo_alloc_for_render(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ unsigned long size,
+ unsigned int alignment)
+{
+ igt_require_f(false, missing_support_str);
+ return (drm_intel_bo *) NULL;
+}
+
+int drm_intel_bo_references(drm_intel_bo *bo, drm_intel_bo *target_bo)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+int drm_intel_gem_bo_wait(drm_intel_bo *bo, int64_t timeout_ns)
+{
+ igt_require_f(false, missing_support_str);
+ return 0;
+}
+
+drm_intel_bo *drm_intel_bo_alloc_userptr(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ void *addr, uint32_t tiling_mode,
+ uint32_t stride, unsigned long size,
+ unsigned long flags)
+{
+ igt_require_f(false, missing_support_str);
+ return NULL;
+}
diff --git a/lib/stubs/drm/intel_bufmgr.h b/lib/stubs/drm/intel_bufmgr.h
new file mode 100644
index 0000000..a1abbcd
--- /dev/null
+++ b/lib/stubs/drm/intel_bufmgr.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright © 2008-2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ *
+ */
+
+/**
+ * @file intel_bufmgr.h
+ *
+ * Public definitions of Intel-specific bufmgr functions.
+ */
+
+#ifndef INTEL_BUFMGR_H
+#define INTEL_BUFMGR_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+struct drm_clip_rect;
+
+typedef struct _drm_intel_bufmgr drm_intel_bufmgr;
+typedef struct _drm_intel_context drm_intel_context;
+typedef struct _drm_intel_bo drm_intel_bo;
+
+struct _drm_intel_bo {
+ /**
+ * Size in bytes of the buffer object.
+ *
+ * The size may be larger than the size originally requested for the
+ * allocation, such as being aligned to page size.
+ */
+ unsigned long size;
+
+ /**
+ * Alignment requirement for object
+ *
+ * Used for GTT mapping & pinning the object.
+ */
+ unsigned long align;
+
+ /**
+ * Deprecated field containing (possibly the low 32-bits of) the last
+ * seen virtual card address. Use offset64 instead.
+ */
+ unsigned long offset;
+
+ /**
+ * Virtual address for accessing the buffer data. Only valid while
+ * mapped.
+ */
+#ifdef __cplusplus
+ void *virt;
+#else
+ void *virtual;
+#endif
+
+ /** Buffer manager context associated with this buffer object */
+ drm_intel_bufmgr *bufmgr;
+
+ /**
+ * MM-specific handle for accessing object
+ */
+ int handle;
+
+ /**
+ * Last seen card virtual address (offset from the beginning of the
+ * aperture) for the object. This should be used to fill relocation
+ * entries when calling drm_intel_bo_emit_reloc()
+ */
+ uint64_t offset64;
+};
+
+enum aub_dump_bmp_format {
+ AUB_DUMP_BMP_FORMAT_8BIT = 1,
+ AUB_DUMP_BMP_FORMAT_ARGB_4444 = 4,
+ AUB_DUMP_BMP_FORMAT_ARGB_0888 = 6,
+ AUB_DUMP_BMP_FORMAT_ARGB_8888 = 7,
+};
+
+typedef struct _drm_intel_aub_annotation {
+ uint32_t type;
+ uint32_t subtype;
+ uint32_t ending_offset;
+} drm_intel_aub_annotation;
+
+#define BO_ALLOC_FOR_RENDER (1<<0)
+
+drm_intel_bo *drm_intel_bo_alloc(drm_intel_bufmgr *bufmgr, const char *name,
+ unsigned long size, unsigned int alignment);
+drm_intel_bo *drm_intel_bo_alloc_for_render(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ unsigned long size,
+ unsigned int alignment);
+drm_intel_bo *drm_intel_bo_alloc_userptr(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ void *addr, uint32_t tiling_mode,
+ uint32_t stride, unsigned long size,
+ unsigned long flags);
+drm_intel_bo *drm_intel_bo_alloc_tiled(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ int x, int y, int cpp,
+ uint32_t *tiling_mode,
+ unsigned long *pitch,
+ unsigned long flags);
+void drm_intel_bo_reference(drm_intel_bo *bo);
+void drm_intel_bo_unreference(drm_intel_bo *bo);
+int drm_intel_bo_map(drm_intel_bo *bo, int write_enable);
+int drm_intel_bo_unmap(drm_intel_bo *bo);
+
+int drm_intel_bo_subdata(drm_intel_bo *bo, unsigned long offset,
+ unsigned long size, const void *data);
+int drm_intel_bo_get_subdata(drm_intel_bo *bo, unsigned long offset,
+ unsigned long size, void *data);
+void drm_intel_bo_wait_rendering(drm_intel_bo *bo);
+
+void drm_intel_bufmgr_set_debug(drm_intel_bufmgr *bufmgr, int enable_debug);
+void drm_intel_bufmgr_destroy(drm_intel_bufmgr *bufmgr);
+int drm_intel_bo_exec(drm_intel_bo *bo, int used,
+ struct drm_clip_rect *cliprects, int num_cliprects, int DR4);
+int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
+ struct drm_clip_rect *cliprects, int num_cliprects, int DR4,
+ unsigned int flags);
+int drm_intel_bufmgr_check_aperture_space(drm_intel_bo ** bo_array, int count);
+
+int drm_intel_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
+ drm_intel_bo *target_bo, uint32_t target_offset,
+ uint32_t read_domains, uint32_t write_domain);
+int drm_intel_bo_emit_reloc_fence(drm_intel_bo *bo, uint32_t offset,
+ drm_intel_bo *target_bo,
+ uint32_t target_offset,
+ uint32_t read_domains, uint32_t write_domain);
+int drm_intel_bo_pin(drm_intel_bo *bo, uint32_t alignment);
+int drm_intel_bo_unpin(drm_intel_bo *bo);
+int drm_intel_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+ uint32_t stride);
+int drm_intel_bo_get_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
+ uint32_t * swizzle_mode);
+int drm_intel_bo_flink(drm_intel_bo *bo, uint32_t * name);
+int drm_intel_bo_busy(drm_intel_bo *bo);
+int drm_intel_bo_madvise(drm_intel_bo *bo, int madv);
+int drm_intel_bo_use_48b_address_range(drm_intel_bo *bo, uint32_t enable);
+int drm_intel_bo_set_softpin_offset(drm_intel_bo *bo, uint64_t offset);
+
+int drm_intel_bo_disable_reuse(drm_intel_bo *bo);
+int drm_intel_bo_is_reusable(drm_intel_bo *bo);
+int drm_intel_bo_references(drm_intel_bo *bo, drm_intel_bo *target_bo);
+
+/* drm_intel_bufmgr_gem.c */
+drm_intel_bufmgr *drm_intel_bufmgr_gem_init(int fd, int batch_size);
+drm_intel_bo *drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ unsigned int handle);
+void drm_intel_bufmgr_gem_enable_reuse(drm_intel_bufmgr *bufmgr);
+void drm_intel_bufmgr_gem_enable_fenced_relocs(drm_intel_bufmgr *bufmgr);
+void drm_intel_bufmgr_gem_set_vma_cache_size(drm_intel_bufmgr *bufmgr,
+ int limit);
+int drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo);
+int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo);
+int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo);
+
+int drm_intel_gem_bo_get_reloc_count(drm_intel_bo *bo);
+void drm_intel_gem_bo_clear_relocs(drm_intel_bo *bo, int start);
+void drm_intel_gem_bo_start_gtt_access(drm_intel_bo *bo, int write_enable);
+
+void
+drm_intel_bufmgr_gem_set_aub_filename(drm_intel_bufmgr *bufmgr,
+ const char *filename);
+void drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable);
+void drm_intel_gem_bo_aub_dump_bmp(drm_intel_bo *bo,
+ int x1, int y1, int width, int height,
+ enum aub_dump_bmp_format format,
+ int pitch, int offset);
+void
+drm_intel_bufmgr_gem_set_aub_annotations(drm_intel_bo *bo,
+ drm_intel_aub_annotation *annotations,
+ unsigned count);
+
+int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id);
+
+int drm_intel_get_aperture_sizes(int fd, size_t *mappable, size_t *total);
+int drm_intel_bufmgr_gem_get_devid(drm_intel_bufmgr *bufmgr);
+int drm_intel_gem_bo_wait(drm_intel_bo *bo, int64_t timeout_ns);
+
+drm_intel_context *drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr);
+void drm_intel_gem_context_destroy(drm_intel_context *ctx);
+int drm_intel_gem_bo_context_exec(drm_intel_bo *bo, drm_intel_context *ctx,
+ int used, unsigned int flags);
+
+int drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd);
+drm_intel_bo *drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr,
+ int prime_fd, int size);
+
+/* drm_intel_bufmgr_fake.c */
+drm_intel_bufmgr *drm_intel_bufmgr_fake_init(int fd,
+ unsigned long low_offset,
+ void *low_virtual,
+ unsigned long size,
+ volatile unsigned int
+ *last_dispatch);
+void drm_intel_bufmgr_fake_set_last_dispatch(drm_intel_bufmgr *bufmgr,
+ volatile unsigned int
+ *last_dispatch);
+void drm_intel_bufmgr_fake_set_exec_callback(drm_intel_bufmgr *bufmgr,
+ int (*exec) (drm_intel_bo *bo,
+ unsigned int used,
+ void *priv),
+ void *priv);
+void drm_intel_bufmgr_fake_set_fence_callback(drm_intel_bufmgr *bufmgr,
+ unsigned int (*emit) (void *priv),
+ void (*wait) (unsigned int fence,
+ void *priv),
+ void *priv);
+drm_intel_bo *drm_intel_bo_fake_alloc_static(drm_intel_bufmgr *bufmgr,
+ const char *name,
+ unsigned long offset,
+ unsigned long size, void *virt);
+void drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo,
+ void (*invalidate_cb) (drm_intel_bo
+ * bo,
+ void *ptr),
+ void *ptr);
+
+void drm_intel_bufmgr_fake_contended_lock_take(drm_intel_bufmgr *bufmgr);
+void drm_intel_bufmgr_fake_evict_all(drm_intel_bufmgr *bufmgr);
+
+struct drm_intel_decode *drm_intel_decode_context_alloc(uint32_t devid);
+void drm_intel_decode_context_free(struct drm_intel_decode *ctx);
+void drm_intel_decode_set_batch_pointer(struct drm_intel_decode *ctx,
+ void *data, uint32_t hw_offset,
+ int count);
+void drm_intel_decode_set_dump_past_end(struct drm_intel_decode *ctx,
+ int dump_past_end);
+void drm_intel_decode_set_head_tail(struct drm_intel_decode *ctx,
+ uint32_t head, uint32_t tail);
+void drm_intel_decode_set_output_file(struct drm_intel_decode *ctx, FILE *out);
+void drm_intel_decode(struct drm_intel_decode *ctx);
+
+int drm_intel_reg_read(drm_intel_bufmgr *bufmgr,
+ uint32_t offset,
+ uint64_t *result);
+
+int drm_intel_get_reset_stats(drm_intel_context *ctx,
+ uint32_t *reset_count,
+ uint32_t *active,
+ uint32_t *pending);
+
+int drm_intel_get_subslice_total(int fd, unsigned int *subslice_total);
+int drm_intel_get_eu_total(int fd, unsigned int *eu_total);
+
+/** @{ Compatibility defines to keep old code building despite the symbol rename
+ * from dri_* to drm_intel_*
+ */
+#define dri_bo drm_intel_bo
+#define dri_bufmgr drm_intel_bufmgr
+#define dri_bo_alloc drm_intel_bo_alloc
+#define dri_bo_reference drm_intel_bo_reference
+#define dri_bo_unreference drm_intel_bo_unreference
+#define dri_bo_map drm_intel_bo_map
+#define dri_bo_unmap drm_intel_bo_unmap
+#define dri_bo_subdata drm_intel_bo_subdata
+#define dri_bo_get_subdata drm_intel_bo_get_subdata
+#define dri_bo_wait_rendering drm_intel_bo_wait_rendering
+#define dri_bufmgr_set_debug drm_intel_bufmgr_set_debug
+#define dri_bufmgr_destroy drm_intel_bufmgr_destroy
+#define dri_bo_exec drm_intel_bo_exec
+#define dri_bufmgr_check_aperture_space drm_intel_bufmgr_check_aperture_space
+#define dri_bo_emit_reloc(reloc_bo, read, write, target_offset, \
+ reloc_offset, target_bo) \
+ drm_intel_bo_emit_reloc(reloc_bo, reloc_offset, \
+ target_bo, target_offset, \
+ read, write);
+#define dri_bo_pin drm_intel_bo_pin
+#define dri_bo_unpin drm_intel_bo_unpin
+#define dri_bo_get_tiling drm_intel_bo_get_tiling
+#define dri_bo_set_tiling(bo, mode) drm_intel_bo_set_tiling(bo, mode, 0)
+#define dri_bo_flink drm_intel_bo_flink
+#define intel_bufmgr_gem_init drm_intel_bufmgr_gem_init
+#define intel_bo_gem_create_from_name drm_intel_bo_gem_create_from_name
+#define intel_bufmgr_gem_enable_reuse drm_intel_bufmgr_gem_enable_reuse
+#define intel_bufmgr_fake_init drm_intel_bufmgr_fake_init
+#define intel_bufmgr_fake_set_last_dispatch drm_intel_bufmgr_fake_set_last_dispatch
+#define intel_bufmgr_fake_set_exec_callback drm_intel_bufmgr_fake_set_exec_callback
+#define intel_bufmgr_fake_set_fence_callback drm_intel_bufmgr_fake_set_fence_callback
+#define intel_bo_fake_alloc_static drm_intel_bo_fake_alloc_static
+#define intel_bo_fake_disable_backing_store drm_intel_bo_fake_disable_backing_store
+#define intel_bufmgr_fake_contended_lock_take drm_intel_bufmgr_fake_contended_lock_take
+#define intel_bufmgr_fake_evict_all drm_intel_bufmgr_fake_evict_all
+
+/** @{ */
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* INTEL_BUFMGR_H */
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (7 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 08/13] lib/stubs: Add stubs for intel_bufmgr robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 10/13] benchmarks/Makefile: " robert.foss
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake specific name of listings in Makefile.sources
with something not automake specific.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
demos/Android.mk | 2 +-
demos/Makefile.am | 2 ++
demos/Makefile.sources | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/demos/Android.mk b/demos/Android.mk
index add2414..90d8b37 100644
--- a/demos/Android.mk
+++ b/demos/Android.mk
@@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES :=
+LOCAL_SRC_FILES := $(demos_prog_lists)
ifeq ($(HAVE_LIBDRM_INTEL),true)
LOCAL_SRC_FILES += $(LIBDRM_INTEL_BIN)
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 48eb6c2..fe0ff1f 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,5 +1,7 @@
include Makefile.sources
+bin_PROGRAMS = $(demos_prog_list)
+
if HAVE_LIBDRM_INTEL
bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
endif
diff --git a/demos/Makefile.sources b/demos/Makefile.sources
index 302f6d9..31f7f83 100644
--- a/demos/Makefile.sources
+++ b/demos/Makefile.sources
@@ -1,4 +1,4 @@
-bin_PROGRAMS = \
+demos_prog_list = \
$(NULL)
HAVE_LIBDRM_INTEL_BIN = \
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 10/13] benchmarks/Makefile: Replace automake specific name of listing in Makfile.sources
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (8 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 11/13] tools/Makefile: Replace automake specific name of listings " robert.foss
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake specific name of listings in Makefile.sources
with something not automake specific.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
benchmarks/Android.mk | 2 +-
benchmarks/Makefile.am | 2 ++
benchmarks/Makefile.sources | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 22ecd2f..147f5db 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -32,7 +32,7 @@ endef
#================#
-benchmark_list := $(benchmarks_PROGRAMS)
+benchmark_list := $(benchmarks_prog_list)
ifeq ($(HAVE_LIBDRM_INTEL),true)
benchmark_list += $(LIBDRM_INTEL_BENCHMARKS)
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index 7400dd0..8ae3cb3 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,5 +1,7 @@
include Makefile.sources
+benchmarks_PROGRAMS = $(benchmarks_prog_list)
+
if HAVE_LIBDRM_INTEL
benchmarks_PROGRAMS += $(LIBDRM_INTEL_BENCHMARKS)
endif
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
index 5804d3b..8fb342a 100644
--- a/benchmarks/Makefile.sources
+++ b/benchmarks/Makefile.sources
@@ -1,6 +1,6 @@
benchmarksdir=$(libexecdir)/intel-gpu-tools/benchmarks
-benchmarks_PROGRAMS = \
+benchmarks_prog_list = \
gem_blt \
gem_create \
gem_exec_ctx \
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 11/13] tools/Makefile: Replace automake specific name of listings in Makfile.sources
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (9 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 10/13] benchmarks/Makefile: " robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources robert.foss
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake specific names of listings in Makefile.sources with
something not automake specific.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
tools/Android.mk | 1 +
tools/Makefile.am | 2 ++
tools/Makefile.sources | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/Android.mk b/tools/Android.mk
index 306a4b5..6cdedeb 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -55,6 +55,7 @@ endef
$(shell mkdir -p $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers)
$(shell cp $(LOCAL_PATH)/registers/* $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)/registers)
+bin_PROGRAMS := $(tools_prog_lists)
skip_tools_list := \
intel_framebuffer_dump \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8ac0d8..d324321 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,7 @@
include Makefile.sources
+bin_PROGRAMS = $(tools_prog_lists)
+
if HAVE_LIBDRM_INTEL
bin_PROGRAMS += $(LIBDRM_INTEL_BIN)
intel_error_decode_LDFLAGS = -lz
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 7ed5fe5..2bb6c8e 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -4,7 +4,7 @@ noinst_PROGRAMS = \
skl_ddb_allocation \
$(NULL)
-bin_PROGRAMS = \
+tools_prog_lists = \
igt_stats \
intel_audio_dump \
intel_reg \
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (10 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 11/13] tools/Makefile: Replace automake specific name of listings " robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 13/13] lib/Makefile: " robert.foss
2016-06-29 10:42 ` [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel Emil Velikov
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake specific names of listings with something that isn't
automake specific.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
lib/tests/Android.mk | 2 +-
lib/tests/Makefile.am | 3 +++
lib/tests/Makefile.sources | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/tests/Android.mk b/lib/tests/Android.mk
index df8e159..026f17f 100644
--- a/lib/tests/Android.mk
+++ b/lib/tests/Android.mk
@@ -37,5 +37,5 @@ IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm
IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
IGT_LOCAL_SHARED_LIBRARIES := libpciaccess libdrm libdrm_intel
-$(foreach item,$(check_PROGRAMS),$(eval $(call add_test,$(item))))
+$(foreach item,$($(check_prog_list)),$(eval $(call add_test,$(item))))
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 582cc3e..c2fa2eb 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -1,5 +1,8 @@
include Makefile.sources
+check_PROGRAMS = $(check_prog_list)
+check_SCRIPTS = $(check_script_list)
+
AM_TESTS_ENVIRONMENT = \
top_builddir=$(top_builddir) \
top_srcdir=$(top_srcdir)
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index 707c445..5d8c785 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -1,4 +1,4 @@
-check_PROGRAMS = \
+check_prog_list = \
igt_no_exit \
igt_no_exit_list_only \
igt_fork_helper \
@@ -15,13 +15,13 @@ check_PROGRAMS = \
igt_exit_handler \
$(NULL)
-check_SCRIPTS = \
+check_script_list = \
igt_command_line.sh \
$(NULL)
TESTS = \
- $(check_PROGRAMS) \
- $(check_SCRIPTS) \
+ $(check_prog_list) \
+ $(check_script_list) \
$(NULL)
# Test that exercise specific asserts in the test framework library and are
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PACTH i-g-t v4 13/13] lib/Makefile: Replace automake specific names of listings in Makefile.sources
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (11 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources robert.foss
@ 2016-06-23 9:34 ` robert.foss
2016-06-29 10:42 ` [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel Emil Velikov
13 siblings, 0 replies; 16+ messages in thread
From: robert.foss @ 2016-06-23 9:34 UTC (permalink / raw)
To: daniel.vetter, daniel.stone, marius.c.vlad, tomeu.vizoso,
emil.l.velikov, chris
Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Replace the automake specific variable names for listings in Makefile.sources
with something not automake specific.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
lib/Android.mk | 2 +-
lib/Makefile.am | 2 ++
lib/Makefile.sources | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/Android.mk b/lib/Android.mk
index badec1e..eb72f84 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -44,7 +44,7 @@ skip_lib_list := \
-DANDROID_HAS_CAIRO=0
endif
-LOCAL_SRC_FILES := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
+LOCAL_SRC_FILES := $(filter-out $(skip_lib_list),$(lib_source_list))
include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 365d7d9..4c0893d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,6 +5,8 @@ SUBDIRS = . tests
include Makefile.sources
+libintel_tools_la_SOURCES = $(lib_source_list)
+
noinst_LTLIBRARIES = libintel_tools.la
noinst_HEADERS = check-ndebug.h
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index f50ff4d..3cc33f4 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -1,4 +1,4 @@
-libintel_tools_la_SOURCES = \
+lib_source_list = \
debug.h \
drmtest.c \
drmtest.h \
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel.
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
` (12 preceding siblings ...)
2016-06-23 9:34 ` [PACTH i-g-t v4 13/13] lib/Makefile: " robert.foss
@ 2016-06-29 10:42 ` Emil Velikov
2016-06-30 7:59 ` Robert Foss
13 siblings, 1 reply; 16+ messages in thread
From: Emil Velikov @ 2016-06-29 10:42 UTC (permalink / raw)
To: Robert Foss; +Cc: daniel.stone, Tomeu Vizoso, Daniel Vetter, intel-gfx
On 23 June 2016 at 10:34, <robert.foss@collabora.com> wrote:
> From: Robert Foss <robert.foss@collabora.com>
>
>
> Hey,
>
> I've been looking at the possibilty of removing the compile time depency on
> libdrm_intel. There are two technical solutions to this problem as far as
> I can see; stubs and conditional compilation.
>
> This series uses the stubbing approach.
>
> Changes since v1:
> - Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
> - Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
> - Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
> - Replaced igt_require with igt_require_f to communicate stubs being the cause
> of failure.
> - Rename intel_drm_stubs to intel_bufmgr.
> - Moved intel_bufmgr to lib/stubs/drm.
> - Remove header inclusion changes in favor for inclusion of stubs in
> lib/stubs/drm using build scripts.
> - Rebased on trunk.
>
> Changes since v2:
> - Removed conditional compilation from intel_bufmgr.h.
> - Enable HAVE_LIBDRM_INTEL on android platforms.
> - Remove unnecessary whitespace.
> - Remove unnecessary inclusion of C files.
> - De-duplicated intel_bufmgr.c error string.
> - Changed Makefile.sources variable names to be non-automake specific
>
> Changes since v3:
> - Added signoff to two commits.
> - Changed automake if not statement.
> - Removed accidental space character.
> - Copied in new copy of intel_bufmgr.h
> - Improved wording of lib/stubs/drm/README.
>
Just an idea/suggestion for the future, not sure if it's normal approach in IGT:
Adding the detailed change log to the respective patch (be that before
or after the --- line) as opposed to here is better IMHO. It provides
provides direct, quick and easy feedback to the reviewer.
Something that just hit me - 1/13 should only do "check for
libdrm_intel and error otherwise. set the AC_CONDITIONAL()" with the
actual "allow libdrm_intel less systems to build IGT" patch coming
after the stubs were introduced.
As-is building w/o libdrm_intel will be allowed, yet broken through
the series, which shouldn't be an issue here. Just something worth
mentioning for future work.
As-is the series is
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-Emil
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel.
2016-06-29 10:42 ` [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel Emil Velikov
@ 2016-06-30 7:59 ` Robert Foss
0 siblings, 0 replies; 16+ messages in thread
From: Robert Foss @ 2016-06-30 7:59 UTC (permalink / raw)
To: Emil Velikov; +Cc: daniel.stone, Tomeu Vizoso, Daniel Vetter, intel-gfx
On 2016-06-29 06:42 AM, Emil Velikov wrote:
> On 23 June 2016 at 10:34, <robert.foss@collabora.com> wrote:
>> From: Robert Foss <robert.foss@collabora.com>
>>
>>
>> Hey,
>>
>> I've been looking at the possibilty of removing the compile time depency on
>> libdrm_intel. There are two technical solutions to this problem as far as
>> I can see; stubs and conditional compilation.
>>
>> This series uses the stubbing approach.
>>
>> Changes since v1:
>> - Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX.
>> - Move conditionals from Makefile.sources to Arduino.mk/Makefile.am.
>> - Removed duplicated i915_drm.h symbols from intel_drm_stubs.h.
>> - Replaced igt_require with igt_require_f to communicate stubs being the cause
>> of failure.
>> - Rename intel_drm_stubs to intel_bufmgr.
>> - Moved intel_bufmgr to lib/stubs/drm.
>> - Remove header inclusion changes in favor for inclusion of stubs in
>> lib/stubs/drm using build scripts.
>> - Rebased on trunk.
>>
>> Changes since v2:
>> - Removed conditional compilation from intel_bufmgr.h.
>> - Enable HAVE_LIBDRM_INTEL on android platforms.
>> - Remove unnecessary whitespace.
>> - Remove unnecessary inclusion of C files.
>> - De-duplicated intel_bufmgr.c error string.
>> - Changed Makefile.sources variable names to be non-automake specific
>>
>> Changes since v3:
>> - Added signoff to two commits.
>> - Changed automake if not statement.
>> - Removed accidental space character.
>> - Copied in new copy of intel_bufmgr.h
>> - Improved wording of lib/stubs/drm/README.
>>
> Just an idea/suggestion for the future, not sure if it's normal approach in IGT:
> Adding the detailed change log to the respective patch (be that before
> or after the --- line) as opposed to here is better IMHO. It provides
> provides direct, quick and easy feedback to the reviewer.
Making a per commit changelog is probably the way to go, I hope you'll
forgive me if don't create a retroactive one for this series though.
I'll make it habit for upcoming series.
>
> Something that just hit me - 1/13 should only do "check for
> libdrm_intel and error otherwise. set the AC_CONDITIONAL()" with the
> actual "allow libdrm_intel less systems to build IGT" patch coming
> after the stubs were introduced.
If someone feels strongly about the issue I'd happily make that change
and submit a v++ patch series.
>
> As-is building w/o libdrm_intel will be allowed, yet broken through
> the series, which shouldn't be an issue here. Just something worth
> mentioning for future work.
>
> As-is the series is
> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
>
> -Emil
>
Thanks for having a look Emil and all the feedback, it's much appreciated.
Rob.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-06-30 7:59 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-23 9:34 [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 01/13] configure.ac: Test for libdrm_intel and build for it if present robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 02/13] configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 03/13] Enable HAVE_LIBDRM_INTEL unconditionally for Android robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 04/13] benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 05/13] tools/Makefile: Don't build tools " robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 06/13] tools/Makefile: Format whitespace robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 07/13] demos/Makefile: Don't build tools that depend on libdrm_intel robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 08/13] lib/stubs: Add stubs for intel_bufmgr robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 09/13] demos/Makefile: Replace automake specific name of listing in Makfile.sources robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 10/13] benchmarks/Makefile: " robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 11/13] tools/Makefile: Replace automake specific name of listings " robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 12/13] lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources robert.foss
2016-06-23 9:34 ` [PACTH i-g-t v4 13/13] lib/Makefile: " robert.foss
2016-06-29 10:42 ` [PACTH i-g-t v4 00/13] Remove compile time depencencies on libdrm_intel Emil Velikov
2016-06-30 7:59 ` Robert Foss
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.