intel-gpu-tools: Changes to 'debian-unstable'
Android.mk | 2
NEWS | 29
README | 13
assembler/Makefile.am | 2
benchmarks/.gitignore | 8
benchmarks/Android.mk | 5
benchmarks/Makefile.am | 6
benchmarks/Makefile.sources | 15
benchmarks/gem_create.c | 176
benchmarks/gem_exec_ctx.c | 202 +
benchmarks/gem_exec_nop.c | 153
benchmarks/gem_exec_reloc.c | 259 +
benchmarks/gem_exec_trace.c | 252 +
benchmarks/gem_exec_tracer.c | 288 +
benchmarks/gem_mmap.c | 178
benchmarks/gem_prw.c | 120
benchmarks/gem_userptr_benchmark.c | 2
benchmarks/intel_upload_blit_large.c | 2
benchmarks/intel_upload_blit_large_gtt.c | 2
benchmarks/intel_upload_blit_large_map.c | 2
benchmarks/intel_upload_blit_small.c | 2
benchmarks/kms_vblank.c | 181
configure.ac | 44
debugger/eudb.c | 6
docs/reference/intel-gpu-tools/igt_test_programs.xml | 10
docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml | 5
lib/Makefile.am | 2
lib/Makefile.sources | 13
lib/drmtest.c | 99
lib/drmtest.h | 11
lib/gpgpu_fill.c | 808 ++++
lib/gpgpu_fill.h | 51
lib/igt.h | 48
lib/igt_aux.c | 23
lib/igt_aux.h | 15
lib/igt_core.c | 48
lib/igt_core.h | 94
lib/igt_debugfs.c | 45
lib/igt_debugfs.h | 12
lib/igt_draw.c | 191 -
lib/igt_draw.h | 2
lib/igt_fb.c | 12
lib/igt_gt.c | 23
lib/igt_kms.c | 24
lib/igt_stats.c | 608 +++
lib/igt_stats.h | 83
lib/intel_batchbuffer.c | 13
lib/intel_chipset.c | 6
lib/intel_iosf.c | 2
lib/intel_mmio.c | 9
lib/intel_os.c | 12
lib/ioctl_wrappers.c | 6
lib/ioctl_wrappers.h | 1
lib/media_fill.h | 7
lib/media_fill_gen7.c | 151
lib/rendercopy_gen9.c | 24
lib/tests/.gitignore | 2
lib/tests/Android.mk | 2
lib/tests/Makefile.am | 4
lib/tests/Makefile.sources | 2
lib/tests/igt_segfault.c | 139
lib/tests/igt_stats.c | 243 +
lib/tests/igt_timeout.c | 2
man/Makefile.am | 6
man/intel_aubdump.man | 38
man/intel_reg.rst | 3
man/intel_reg_dumper.man | 33
man/intel_reg_read.man | 15
man/intel_reg_snapshot.man | 15
man/intel_reg_write.man | 16
overlay/gpu-freq.c | 11
overlay/gpu-top.c | 25
overlay/i915_pciids.h | 87
overlay/igfx.c | 24
overlay/overlay.c | 6
shaders/gpgpu/gpgpu_fill.gxa | 14
tests/.gitignore | 31
tests/Android.mk | 2
tests/Makefile.am | 3
tests/Makefile.sources | 19
tests/core_get_client_auth.c | 9
tests/core_getclient.c | 4
tests/core_getstats.c | 5
tests/core_getversion.c | 4
tests/drm_auth.c | 8
tests/drm_import_export.c | 119
tests/drm_read.c | 6
tests/drm_vma_limiter.c | 8
tests/drm_vma_limiter_cached.c | 8
tests/drm_vma_limiter_cpu.c | 8
tests/drm_vma_limiter_gtt.c | 8
tests/drv_getparams.c | 165
tests/drv_getparams_basic.c | 164
tests/drv_hangman.c | 23
tests/drv_module_reload | 60
tests/drv_module_reload_basic | 60
tests/drv_suspend.c | 7
tests/eviction_common.c | 5
tests/gem_alive.c | 4
tests/gem_bad_address.c | 8
tests/gem_bad_batch.c | 8
tests/gem_bad_blit.c | 8
tests/gem_bad_length.c | 5
tests/gem_bad_reloc.c | 39
tests/gem_basic.c | 5
tests/gem_caching.c | 9
tests/gem_close_race.c | 4
tests/gem_concurrent_all.c | 13
tests/gem_cpu_reloc.c | 9
tests/gem_cs_prefetch.c | 9
tests/gem_cs_tlb.c | 7
tests/gem_ctx_bad_destroy.c | 5
tests/gem_ctx_bad_exec.c | 5
tests/gem_ctx_basic.c | 10
tests/gem_ctx_create.c | 5
tests/gem_ctx_exec.c | 9
tests/gem_ctx_param_basic.c | 60
tests/gem_ctx_thrash.c | 9
tests/gem_double_irq_loop.c | 8
tests/gem_dummy_reloc_loop.c | 10
tests/gem_eio.c | 193 +
tests/gem_evict_alignment.c | 8
tests/gem_evict_everything.c | 7
tests/gem_exec_alignment.c | 85
tests/gem_exec_bad_domains.c | 8
tests/gem_exec_big.c | 7
tests/gem_exec_blt.c | 7
tests/gem_exec_faulting_reloc.c | 8
tests/gem_exec_lut_handle.c | 6
tests/gem_exec_nop.c | 63
tests/gem_exec_params.c | 38
tests/gem_exec_parse.c | 6
tests/gem_fd_exhaustion.c | 6
tests/gem_fence_thrash.c | 16
tests/gem_fence_upload.c | 11
tests/gem_fenced_exec_thrash.c | 45
tests/gem_flink.c | 169
tests/gem_flink_basic.c | 168
tests/gem_flink_race.c | 10
tests/gem_gpgpu_fill.c | 8
tests/gem_gtt_cpu_tlb.c | 6
tests/gem_gtt_hog.c | 8
tests/gem_gtt_speed.c | 5
tests/gem_hang.c | 8
tests/gem_hangcheck_forcewake.c | 8
tests/gem_largeobject.c | 5
tests/gem_linear_blits.c | 8
tests/gem_lut_handle.c | 5
tests/gem_madvise.c | 11
tests/gem_media_fill.c | 8
tests/gem_mmap.c | 70
tests/gem_mmap_gtt.c | 47
tests/gem_mmap_offset_exhaustion.c | 5
tests/gem_mmap_wc.c | 8
tests/gem_multi_bsd_sync_loop.c | 10
tests/gem_non_secure_batch.c | 8
tests/gem_partial_pwrite_pread.c | 8
tests/gem_persistent_relocs.c | 9
tests/gem_pin.c | 8
tests/gem_pipe_control_store_loop.c | 8
tests/gem_ppgtt.c | 15
tests/gem_pread.c | 7
tests/gem_pread_after_blit.c | 9
tests/gem_pwrite.c | 8
tests/gem_pwrite_pread.c | 8
tests/gem_pwrite_snooped.c | 140
tests/gem_read_read_speed.c | 11
tests/gem_readwrite.c | 5
tests/gem_reg_read.c | 144
tests/gem_reloc_overflow.c | 7
tests/gem_reloc_vs_gpu.c | 12
tests/gem_render_copy.c | 9
tests/gem_render_copy_redux.c | 9
tests/gem_render_linear_blits.c | 9
tests/gem_render_tiled_blits.c | 9
tests/gem_reset_stats.c | 47
tests/gem_ring_sync_copy.c | 7
tests/gem_ring_sync_loop.c | 8
tests/gem_ringfill.c | 119
tests/gem_seqno_wrap.c | 11
tests/gem_set_tiling_vs_blt.c | 8
tests/gem_set_tiling_vs_gtt.c | 7
tests/gem_set_tiling_vs_pwrite.c | 6
tests/gem_storedw_batches_loop.c | 8
tests/gem_storedw_loop.c | 185
tests/gem_storedw_loop_blt.c | 154
tests/gem_storedw_loop_bsd.c | 157
tests/gem_storedw_loop_render.c | 151
tests/gem_storedw_loop_vebox.c | 131
tests/gem_streaming_writes.c | 60
tests/gem_stress.c | 9
tests/gem_threaded_access_tiled.c | 5
tests/gem_tiled_blits.c | 8
tests/gem_tiled_fence_blits.c | 9
tests/gem_tiled_partial_pwrite_pread.c | 8
tests/gem_tiled_pread.c | 217 -
tests/gem_tiled_pread_basic.c | 214 +
tests/gem_tiled_pread_pwrite.c | 7
tests/gem_tiled_swapping.c | 8
tests/gem_tiled_wb.c | 7
tests/gem_tiled_wc.c | 7
tests/gem_tiling_max_stride.c | 7
tests/gem_unfence_active_buffers.c | 8
tests/gem_unref_active_buffers.c | 8
tests/gem_userptr_blits.c | 11
tests/gem_wait.c | 14
tests/gem_workarounds.c | 9
tests/gem_write_read_ring_switch.c | 8
tests/gen3_mixed_blits.c | 8
tests/gen3_render_linear_blits.c | 8
tests/gen3_render_mixed_blits.c | 8
tests/gen3_render_tiledx_blits.c | 8
tests/gen3_render_tiledy_blits.c | 8
tests/gen7_forcewake_mt.c | 8
tests/kms_3d.c | 6
tests/kms_addfb.c | 372 -
tests/kms_addfb_basic.c | 435 ++
tests/kms_crtc_background_color.c | 7
tests/kms_cursor_crc.c | 8
tests/kms_draw_crc.c | 122
tests/kms_fbc_crc.c | 31
tests/kms_fbcon_fbt.c | 270 +
tests/kms_fence_pin_leak.c | 9
tests/kms_flip.c | 29
tests/kms_flip_event_leak.c | 11
tests/kms_flip_tiling.c | 8
tests/kms_force_connector.c | 6
tests/kms_frontbuffer_tracking.c | 1673 ++++++--
tests/kms_legacy_colorkey.c | 6
tests/kms_mmio_vs_cs_flip.c | 8
tests/kms_panel_fitting.c | 9
tests/kms_pipe_b_c_ivb.c | 6
tests/kms_pipe_crc_basic.c | 8
tests/kms_plane.c | 7
tests/kms_plane_scaling.c | 9
tests/kms_psr_sink_crc.c | 10
tests/kms_pwrite_crc.c | 34
tests/kms_render.c | 9
tests/kms_rotation_crc.c | 8
tests/kms_setmode.c | 9
tests/kms_sink_crc_basic.c | 6
tests/kms_universal_plane.c | 26
tests/kms_vblank.c | 11
tests/pm_backlight.c | 4
tests/pm_lpsp.c | 7
tests/pm_rc6_residency.c | 7
tests/pm_rpm.c | 25
tests/pm_rps.c | 13
tests/pm_sseu.c | 10
tests/prime_nv_api.c | 5
tests/prime_nv_pcopy.c | 6
tests/prime_nv_test.c | 6
tests/prime_self_import.c | 44
tests/prime_udl.c | 6
tests/template.c | 4
tests/testdisplay.c | 7
tests/testdisplay_hotplug.c | 4
tools/.gitignore | 11
tools/Android.mk | 24
tools/Makefile.am | 23
tools/Makefile.sources | 10
tools/aubdump.c | 561 ++
tools/igt_stats.c | 105
tools/intel_aub.h | 153
tools/intel_aubdump.in | 77
tools/intel_bios.h | 29
tools/intel_bios_reader.c | 75
tools/intel_display_poller.c | 324 -
tools/intel_firmware_decode.c | 287 +
tools/intel_gpu_frequency.c | 2
tools/intel_iosf_sb_read.c | 153
tools/intel_iosf_sb_write.c | 140
tools/intel_l3_parity.c | 2
tools/intel_l3_udev_listener.c | 4
tools/intel_perf_counters.c | 2
tools/intel_reg.c | 33
tools/intel_reg_dumper.c | 3020 ----------------
tools/intel_reg_read.c | 145
tools/intel_reg_snapshot.c | 56
tools/intel_reg_spec.c | 12
tools/intel_reg_spec.h | 1
tools/intel_reg_write.c | 60
tools/intel_vga_read.c | 97
tools/intel_vga_write.c | 97
tools/null_state_gen/Makefile.am | 2
tools/null_state_gen/intel_batchbuffer.c | 9
tools/null_state_gen/intel_batchbuffer.h | 6
tools/null_state_gen/intel_null_state_gen.c | 8
tools/null_state_gen/intel_renderstate.h | 34
tools/null_state_gen/intel_renderstate_gen6.c | 2
tools/null_state_gen/intel_renderstate_gen7.c | 4
tools/null_state_gen/intel_renderstate_gen8.c | 6
tools/null_state_gen/intel_renderstate_gen9.c | 14
tools/quick_dump/.gitignore | 2
tools/quick_dump/Makefile.am | 33
tools/quick_dump/audio_config_haswell_plus.txt | 35
tools/quick_dump/audio_debug_haswell_plus.txt | 8
tools/quick_dump/base_interrupt.txt | 20
tools/quick_dump/base_other.txt | 7
tools/quick_dump/base_power.txt | 21
tools/quick_dump/base_rings.txt | 33
tools/quick_dump/broadwell | 7
tools/quick_dump/cherryview | 8
tools/quick_dump/chipset.i | 41
tools/quick_dump/chipset_macro_wrap.c | 68
tools/quick_dump/chv_display_base.txt | 211 -
tools/quick_dump/chv_dpio_phy_x1.txt | 216 -
tools/quick_dump/chv_dpio_phy_x2.txt | 392 --
tools/quick_dump/chv_pipe_c.txt | 168
tools/quick_dump/common_display.txt | 197 -
tools/quick_dump/gen6_other.txt | 1
tools/quick_dump/gen7_other.txt | 3
tools/quick_dump/gen8_interrupt.txt | 44
tools/quick_dump/gen8_other.txt | 2
tools/quick_dump/haswell | 5
tools/quick_dump/haswell_other.txt | 25
tools/quick_dump/ivybridge | 2
tools/quick_dump/quick_dump.py | 117
tools/quick_dump/reg_access.py | 62
tools/quick_dump/sandybridge | 2
tools/quick_dump/skl_display.txt | 400 --
tools/quick_dump/skl_powerwells.txt | 4
tools/quick_dump/skylake | 4
tools/quick_dump/valleyview | 7
tools/quick_dump/vlv_display_base.txt | 180
tools/quick_dump/vlv_dpio_phy.txt | 198 -
tools/quick_dump/vlv_dsi.txt | 108
tools/quick_dump/vlv_flisdsi.txt | 39
tools/quick_dump/vlv_pipe_a.txt | 175
tools/quick_dump/vlv_pipe_b.txt | 174
tools/quick_dump/vlv_power.txt | 14
tools/registers/Makefile.am | 2
tools/registers/audio_config_haswell_plus.txt | 35
tools/registers/audio_debug_haswell_plus.txt | 8
tools/registers/base_interrupt.txt | 20
tools/registers/base_other.txt | 7
tools/registers/base_power.txt | 21
tools/registers/base_rings.txt | 33
tools/registers/broadwell | 7
tools/registers/cherryview | 8
tools/registers/chv_display_base.txt | 211 +
tools/registers/chv_dpio_phy_x1.txt | 216 +
tools/registers/chv_dpio_phy_x2.txt | 392 ++
tools/registers/chv_pipe_c.txt | 168
tools/registers/common_display.txt | 197 +
tools/registers/gen6_other.txt | 1
tools/registers/gen7_other.txt | 3
tools/registers/gen8_interrupt.txt | 44
tools/registers/gen8_other.txt | 2
tools/registers/haswell | 5
tools/registers/haswell_other.txt | 25
tools/registers/ivybridge | 2
tools/registers/sandybridge | 2
tools/registers/skl_display.txt | 400 ++
tools/registers/skl_powerwells.txt | 4
tools/registers/skylake | 4
tools/registers/valleyview | 7
tools/registers/vlv_display_base.txt | 180
tools/registers/vlv_dpio_phy.txt | 198 +
tools/registers/vlv_dsi.txt | 108
tools/registers/vlv_flisdsi.txt | 39
tools/registers/vlv_pipe_a.txt | 175
tools/registers/vlv_pipe_b.txt | 174
tools/registers/vlv_power.txt | 14
tools/skl_compute_wrpll.c | 76
365 files changed, 13163 insertions(+), 10811 deletions(-)
New commits:
commit 1f9e0550455be4b219954a026407dd23ec21b299
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Sep 11 15:15:13 2015 +0100
Update version to 1.12 and add the release date
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/NEWS b/NEWS
index 8f2ce23..65081c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Release 1.12 (XXXX-XX-XX)
+Release 1.12 (2015-09-11)
-------------------------
- Various new tests and tools
diff --git a/configure.ac b/configure.ac
index c7cb199..5f97466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ([2.60])
AC_INIT([intel-gpu-tools],
- [1.11],
+ [1.12],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI&component=DRM/Intel],
[intel-gpu-tools])
commit c5902bffe3ff4d6c1dc77b97651fc3b3ff04e049
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Sep 11 15:13:00 2015 +0100
NEWS: Updates
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/NEWS b/NEWS
index c2643aa..8f2ce23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,31 @@
Release 1.12 (XXXX-XX-XX)
-------------------------
+- Various new tests and tools
+
+- New statistical analysis functions. (Damien Lespiau)
+
+- New benchmark tests. (Chris Wilson)
+
+- Old register tools that were superseded by intel_reg have been removed.
+
+- Various tests have been marked "basic", to indicate they are suitable for
+ use in basic acceptance testing. (Jesse Barnes)
+
+- Per-ring gem_storedw_loop tests combined into a single test with subtests.
+ (Jesse Barnes)
+
+- New "aubdump" tool, used to launch an application and capture rendering to
+ an AUB file. (Kristian Høgsberg Kristensen)
+
+- Cherryview support added to intel_display_poller. (Ville Syrjälä)
+
+- Skylake and Broadwell support added to gem_gpgpu_fill tests.
+ (Dominik Zeromski)
+
+- Support for running core drm tests on any platform. (Micah Fedke)
+
+- Many other bug fixes
Release 1.11 (2015-06-11)
-------------------------
commit 21111730832f8139a215cf8ba66471ef7e992984
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Fri Aug 14 14:36:36 2015 +0000
tests: update core_getstats to run on any platform
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
index aebbc45..fde27cd 100644
--- a/tests/core_getstats.c
+++ b/tests/core_getstats.c
@@ -47,7 +47,7 @@ igt_simple_main
int fd, ret;
drm_stats_t stats;
- fd = drm_open_driver(DRIVER_INTEL);
+ fd = drm_open_driver(DRIVER_ANY);
ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
igt_assert(ret == 0);
commit fd282fb9d48c265533af91a291da368ac4c626e9
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Fri Aug 14 14:35:46 2015 +0000
tests: update core_getclient to run on any platform
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
index 811a773..40a1c19 100644
--- a/tests/core_getclient.c
+++ b/tests/core_getclient.c
@@ -39,7 +39,7 @@ igt_simple_main
int fd, ret;
drm_client_t client;
- fd = drm_open_driver(DRIVER_INTEL);
+ fd = drm_open_driver(DRIVER_ANY);
/* Look for client index 0. This should exist whether we're operating
* on an otherwise unused drm device, or the X Server is running on
commit 75c9e92efb9522d6f2c455dc35ba169c1d67ad52
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Thu Aug 13 14:05:52 2015 +0000
tests: update core_getversion to run on any platform
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index 530d725..5830068 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -37,7 +37,7 @@ igt_simple_main
int fd;
drmVersionPtr v;
- fd = drm_open_driver(DRIVER_INTEL);
+ fd = drm_open_driver(DRIVER_ANY);
v = drmGetVersion(fd);
igt_assert(strlen(v->name) != 0);
igt_assert(strlen(v->date) != 0);
commit 253544f7a376d02d306a111019ef102a79acc4f3
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Thu Aug 13 13:59:23 2015 +0000
tests: update core_get_client_auth to run on any platform
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/tests/core_get_client_auth.c b/tests/core_get_client_auth.c
index 85479c8..50e87fa 100644
--- a/tests/core_get_client_auth.c
+++ b/tests/core_get_client_auth.c
@@ -83,7 +83,7 @@ igt_main
{
/* root (which we run igt as) should always be authenticated */
igt_subtest("simple") {
- int fd = drm_open_driver(DRIVER_INTEL);
+ int fd = drm_open_driver(DRIVER_ANY);
igt_assert(check_auth(fd) == true);
@@ -91,8 +91,8 @@ igt_main
}
igt_subtest("master-drop") {
- int fd = drm_open_driver(DRIVER_INTEL);
- int fd2 = drm_open_driver(DRIVER_INTEL);
+ int fd = drm_open_driver(DRIVER_ANY);
+ int fd2 = drm_open_driver(DRIVER_ANY);
igt_assert(check_auth(fd2) == true);
commit f91e93fa40cf76a0d78c4f022ff94e554fd73032
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Wed Jul 22 20:32:06 2015 +0000
lib: remove support for deprecated drm_open_any*() calls
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 9686368..bb50408 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -41,13 +41,6 @@
#define DRIVER_ANY 0x1
#define DRIVER_INTEL (0x1 << 1)
-/* provide the deprecated drm_open_any*() calls */
-#define drm_open_any() drm_open_driver(DRIVER_ANY)
-#define drm_open_any_master() drm_open_driver_master(DRIVER_ANY)
-#define drm_open_any_render() drm_open_driver_render(DRIVER_ANY)
-#define __drm_open_any() __drm_open_driver(DRIVER_ANY)
-
-
#ifdef ANDROID
#if (!(defined HAVE_MMAP64)) && (!(defined __x86_64__))
extern void* __mmap2(void *, size_t, int, int, int, off_t);
commit c81d293aed94fea9c48899187016a1b28f8989d5
Author: Micah Fedke <micah.fedke@collabora.co.uk>
Date: Wed Jul 22 21:54:02 2015 +0000
convert drm_open_any*() calls to drm_open_driver*(DRIVER_INTEL) calls with cocci
Apply the new API to all call sites within the test suite using the following
semantic patch:
// Semantic patch for replacing drm_open_any* with arch-specific drm_open_driver* calls
@@
identifier i =~ "\bdrm_open_any\b";
@@
- i()
+ drm_open_driver(DRIVER_INTEL)
@@
identifier i =~ "\bdrm_open_any_master\b";
@@
- i()
+ drm_open_driver_master(DRIVER_INTEL)
@@
identifier i =~ "\bdrm_open_any_render\b";
@@
- i()
+ drm_open_driver_render(DRIVER_INTEL)
@@
identifier i =~ "\b__drm_open_any\b";
@@
- i()
+ __drm_open_driver(DRIVER_INTEL)
Signed-off-by: Micah Fedke <micah.fedke@collabora.co.uk>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/benchmarks/gem_create.c b/benchmarks/gem_create.c
index 21e8d86..9ead30c 100644
--- a/benchmarks/gem_create.c
+++ b/benchmarks/gem_create.c
@@ -88,7 +88,7 @@ static void make_busy(int fd, uint32_t handle)
int main(int argc, char **argv)
{
- int fd = drm_open_any();
+ int fd = drm_open_driver(DRIVER_INTEL);
int size = 0;
int busy = 0;
int reps = 13;
diff --git a/benchmarks/gem_exec_ctx.c b/benchmarks/gem_exec_ctx.c
index dbf7c3a..2da653a 100644
--- a/benchmarks/gem_exec_ctx.c
+++ b/benchmarks/gem_exec_ctx.c
@@ -89,7 +89,7 @@ static int loop(unsigned ring, int reps, enum mode mode)
int count, fd;
uint32_t ctx;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
memset(&gem_exec, 0, sizeof(gem_exec));
gem_exec.handle = batch(fd);
diff --git a/benchmarks/gem_exec_nop.c b/benchmarks/gem_exec_nop.c
index 2a3abd2..c22e1da 100644
--- a/benchmarks/gem_exec_nop.c
+++ b/benchmarks/gem_exec_nop.c
@@ -76,7 +76,7 @@ static int loop(unsigned ring, int reps)
struct drm_i915_gem_exec_object2 gem_exec;
int count, fd;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
memset(&gem_exec, 0, sizeof(gem_exec));
gem_exec.handle = batch(fd);
diff --git a/benchmarks/gem_exec_reloc.c b/benchmarks/gem_exec_reloc.c
index 42007d0..274ce41 100644
--- a/benchmarks/gem_exec_reloc.c
+++ b/benchmarks/gem_exec_reloc.c
@@ -84,7 +84,7 @@ static int run(unsigned batch_size,
mem_reloc = calloc(sizeof(*mem_reloc), num_relocs);
target = calloc(sizeof(*target), num_relocs);
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
for (n = 0; n < num_objects; n++)
gem_exec[n].handle = gem_create(fd, 4096);
diff --git a/benchmarks/gem_exec_trace.c b/benchmarks/gem_exec_trace.c
index 64b2615..b487d76 100644
--- a/benchmarks/gem_exec_trace.c
+++ b/benchmarks/gem_exec_trace.c
@@ -118,7 +118,7 @@ static void replay(const char *filename)
madvise(ptr, st.st_size, MADV_SEQUENTIAL);
end = ptr + st.st_size;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
clock_gettime(CLOCK_MONOTONIC, &t_start);
do {
diff --git a/benchmarks/gem_mmap.c b/benchmarks/gem_mmap.c
index da71274..bc26d31 100644
--- a/benchmarks/gem_mmap.c
+++ b/benchmarks/gem_mmap.c
@@ -54,7 +54,7 @@ static uint64_t elapsed(const struct timespec *start,
int main(int argc, char **argv)
{
- int fd = drm_open_any();
+ int fd = drm_open_driver(DRIVER_INTEL);
enum map {CPU, GTT, WC} map = CPU;
enum dir {READ, WRITE, CLEAR, FAULT} dir = READ;
int tiling = I915_TILING_NONE;
diff --git a/benchmarks/gem_prw.c b/benchmarks/gem_prw.c
index cf9218e..c284604 100644
--- a/benchmarks/gem_prw.c
+++ b/benchmarks/gem_prw.c
@@ -54,7 +54,7 @@ static uint64_t elapsed(const struct timespec *start,
int main(int argc, char **argv)
{
- int fd = drm_open_any();
+ int fd = drm_open_driver(DRIVER_INTEL);
int domain = I915_GEM_DOMAIN_GTT;
enum dir { READ, WRITE } dir = READ;
void *buf = malloc(OBJECT_SIZE);
diff --git a/benchmarks/gem_userptr_benchmark.c b/benchmarks/gem_userptr_benchmark.c
index b804fdd..1eae7ff 100644
--- a/benchmarks/gem_userptr_benchmark.c
+++ b/benchmarks/gem_userptr_benchmark.c
@@ -515,7 +515,7 @@ int main(int argc, char **argv)
igt_subtest_init(argc, argv);
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
igt_assert(fd >= 0);
ret = has_userptr(fd);
diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 689f9c4..1984bfd 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -124,7 +124,7 @@ int main(int argc, char **argv)
struct intel_batchbuffer *batch;
int i;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/benchmarks/intel_upload_blit_large_gtt.c b/benchmarks/intel_upload_blit_large_gtt.c
index 601496d..d62a01e 100644
--- a/benchmarks/intel_upload_blit_large_gtt.c
+++ b/benchmarks/intel_upload_blit_large_gtt.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
struct intel_batchbuffer *batch;
int i;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/benchmarks/intel_upload_blit_large_map.c b/benchmarks/intel_upload_blit_large_map.c
index d916737..03bf760 100644
--- a/benchmarks/intel_upload_blit_large_map.c
+++ b/benchmarks/intel_upload_blit_large_map.c
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
struct intel_batchbuffer *batch;
int i;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/benchmarks/intel_upload_blit_small.c b/benchmarks/intel_upload_blit_small.c
index b9640a4..ac557a4 100644
--- a/benchmarks/intel_upload_blit_small.c
+++ b/benchmarks/intel_upload_blit_small.c
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
struct intel_batchbuffer *batch;
int i;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/benchmarks/kms_vblank.c b/benchmarks/kms_vblank.c
index 3d2f977..838afa0 100644
--- a/benchmarks/kms_vblank.c
+++ b/benchmarks/kms_vblank.c
@@ -161,7 +161,7 @@ int main(int argc, char **argv)
}
}
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
if (!crtc0_active(fd)) {
fprintf(stderr, "CRTC/pipe 0 not active\n");
return 77;
diff --git a/debugger/eudb.c b/debugger/eudb.c
index 275a27e..e015e2e 100644
--- a/debugger/eudb.c
+++ b/debugger/eudb.c
@@ -551,7 +551,7 @@ int main(int argc, char* argv[]) {
*/
if (!clear_waits) {
int dh_handle;
- drm_fd = drm_open_any();
+ drm_fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
setup_hw_bits();
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index c181e43..69cf365 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -200,7 +200,7 @@ int igt_fork_hang_helper(void)
if (igt_only_list_subtests())
return 1;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
if (fd == -1)
return 0;
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 0d45f45..51d735d 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1957,7 +1957,7 @@ void igt_enable_connectors(void)
drmModeConnector *c;
int drm_fd;
- drm_fd = drm_open_any();
+ drm_fd = drm_open_driver(DRIVER_INTEL);
res = drmModeGetResources(drm_fd);
diff --git a/tests/core_get_client_auth.c b/tests/core_get_client_auth.c
index 7301ca0..85479c8 100644
--- a/tests/core_get_client_auth.c
+++ b/tests/core_get_client_auth.c
@@ -83,7 +83,7 @@ igt_main
{
/* root (which we run igt as) should always be authenticated */
igt_subtest("simple") {
- int fd = drm_open_any();
+ int fd = drm_open_driver(DRIVER_INTEL);
igt_assert(check_auth(fd) == true);
@@ -91,8 +91,8 @@ igt_main
}
igt_subtest("master-drop") {
- int fd = drm_open_any();
- int fd2 = drm_open_any();
+ int fd = drm_open_driver(DRIVER_INTEL);
+ int fd2 = drm_open_driver(DRIVER_INTEL);
igt_assert(check_auth(fd2) == true);
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
index aae00ea..811a773 100644
--- a/tests/core_getclient.c
+++ b/tests/core_getclient.c
@@ -39,7 +39,7 @@ igt_simple_main
int fd, ret;
drm_client_t client;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
/* Look for client index 0. This should exist whether we're operating
* on an otherwise unused drm device, or the X Server is running on
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
index 3db6b09..aebbc45 100644
--- a/tests/core_getstats.c
+++ b/tests/core_getstats.c
@@ -47,7 +47,7 @@ igt_simple_main
int fd, ret;
drm_stats_t stats;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
igt_assert(ret == 0);
diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index 1c0f824..530d725 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -37,7 +37,7 @@ igt_simple_main
int fd;
drmVersionPtr v;
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
v = drmGetVersion(fd);
igt_assert(strlen(v->name) != 0);
igt_assert(strlen(v->date) != 0);
diff --git a/tests/drm_auth.c b/tests/drm_auth.c
index e936666..d262469 100644
--- a/tests/drm_auth.c
+++ b/tests/drm_auth.c
@@ -120,7 +120,7 @@ static void test_basic_auth(int master)
int slave;
/* open slave and make sure it's NOT a master */
- slave = drm_open_any();
+ slave = drm_open_driver(DRIVER_INTEL);
igt_require(slave >= 0);
igt_require(drmSetMaster(slave) < 0);
@@ -151,7 +151,7 @@ igt_main
int master;
igt_fixture
- master = drm_open_any_master();
+ master = drm_open_driver_master(DRIVER_INTEL);
igt_subtest("basic-auth")
test_basic_auth(master);
diff --git a/tests/drm_import_export.c b/tests/drm_import_export.c
index 41c4746..29c228f 100644
--- a/tests/drm_import_export.c
+++ b/tests/drm_import_export.c
@@ -239,14 +239,14 @@ pthread_t test_thread_id4;
igt_main {
igt_fixture {
- fd1 = drm_open_any();
+ fd1 = drm_open_driver(DRIVER_INTEL);
igt_assert(fd1 >= 0);
bufmgr1 = drm_intel_bufmgr_gem_init(fd1, 8 *1024);
igt_assert(bufmgr1);
drm_intel_bufmgr_gem_enable_reuse(bufmgr1);
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
igt_assert(fd >= 0);
bufmgr = drm_intel_bufmgr_gem_init(fd, 8 *1024);
igt_assert(bufmgr);
diff --git a/tests/drm_read.c b/tests/drm_read.c
index b808bed..8587aee 100644
--- a/tests/drm_read.c
+++ b/tests/drm_read.c
@@ -200,7 +200,7 @@ igt_main
siginterrupt(SIGALRM, 1);
igt_fixture {
- fd = drm_open_any_master();
+ fd = drm_open_driver_master(DRIVER_INTEL);
igt_require(pipe0_enabled(fd));
}
diff --git a/tests/drm_vma_limiter.c b/tests/drm_vma_limiter.c
index ce3d364..fc853f3 100644
--- a/tests/drm_vma_limiter.c
+++ b/tests/drm_vma_limiter.c
@@ -60,7 +60,7 @@ igt_simple_main
igt_skip_on_simulation();
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/drm_vma_limiter_cached.c b/tests/drm_vma_limiter_cached.c
index d460872..a47c797 100644
--- a/tests/drm_vma_limiter_cached.c
+++ b/tests/drm_vma_limiter_cached.c
@@ -59,7 +59,7 @@ igt_simple_main
igt_skip_on_simulation();
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/drm_vma_limiter_cpu.c b/tests/drm_vma_limiter_cpu.c
index f2a7843..5ea7491 100644
--- a/tests/drm_vma_limiter_cpu.c
+++ b/tests/drm_vma_limiter_cpu.c
@@ -59,7 +59,7 @@ igt_simple_main
igt_skip_on_simulation();
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/drm_vma_limiter_gtt.c b/tests/drm_vma_limiter_gtt.c
index d7e8619..5202823 100644
--- a/tests/drm_vma_limiter_gtt.c
+++ b/tests/drm_vma_limiter_gtt.c
@@ -60,7 +60,7 @@ igt_simple_main
igt_skip_on_simulation();
- fd = drm_open_any();
+ fd = drm_open_driver(DRIVER_INTEL);
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/drv_getparams_basic.c b/tests/drv_getparams_basic.c
index 39120dd..7cb210d 100644
--- a/tests/drv_getparams_basic.c
+++ b/tests/drv_getparams_basic.c
@@ -40,7 +40,7 @@ int devid;
static void
init(void)
{
Reply to: