[PATCH i-g-t v4 1/2] tests/intel: rename drm_fdinfo into i915_fdinfo

[Kamil Konieczny]

This test works only for i915 driver and also uses i915 specific
workload to validate fdinfo so rename it to avoid confusion.

Also while at this, sort out few i915 build names in meson.

v2: correct Tvrto address (Kamil)
v3: removed from xe.blocklist and squashed into one patch (Lucas)
v4: corrected lib dependency in meson.build (Kamil)

Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>
---
 tests/intel-ci/xe.blocklist.txt             |  1 -
 tests/intel/{drm_fdinfo.c => i915_fdinfo.c} |  2 +-
 tests/meson.build                           | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename tests/intel/{drm_fdinfo.c => i915_fdinfo.c} (99%)

diff --git a/tests/intel-ci/xe.blocklist.txt b/tests/intel-ci/xe.blocklist.txt
index f9ef612c4..6fe893f7a 100644
--- a/tests/intel-ci/xe.blocklist.txt
+++ b/tests/intel-ci/xe.blocklist.txt
@@ -33,7 +33,6 @@ igt at kms_selftest.*
 ##################################################################
 igt at debugfs.*
 igt at device_reset
-igt at drm_fdinfo
 igt at drm_read
 igt at dumb.*
 igt at prime_.*
diff --git a/tests/intel/drm_fdinfo.c b/tests/intel/i915_fdinfo.c
similarity index 99%
rename from tests/intel/drm_fdinfo.c
rename to tests/intel/i915_fdinfo.c
index b66ac9e1b..c26ae9737 100644
--- a/tests/intel/drm_fdinfo.c
+++ b/tests/intel/i915_fdinfo.c
@@ -34,7 +34,7 @@
 #include "i915/gem_vm.h"
 #include "intel_ctx.h"
 /**
- * TEST: drm fdinfo
+ * TEST: i915 fdinfo
  * Description: Test the i915 drm fdinfo data
  * Category: Core
  * Mega feature: General Core features
diff --git a/tests/meson.build b/tests/meson.build
index 2724c7a9a..393963093 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -88,7 +88,6 @@ intel_i915_xe_progs = [
 intel_i915_progs = [
 	'api_intel_bb',
 	'debugfs_test',
-	'drm_fdinfo',
 	'gen3_mixed_blits',
 	'gen3_render_linear_blits',
 	'gen3_render_mixed_blits',
@@ -211,15 +210,14 @@ intel_i915_progs = [
 	'gem_wait',
 	'gem_watchdog',
 	'gem_workarounds',
-	'perf',
-	'perf_pmu',
 	'i915_fb_tiling',
+	'i915_fdinfo',
 	'i915_getparams_basic',
-	'i915_pm_freq_api',
 	'i915_hangman',
 	'i915_module_load',
 	'i915_pciid',
 	'i915_pipe_stress',
+	'i915_pm_freq_api',
 	'i915_pm_freq_mult',
 	'i915_pm_rpm',
 	'i915_pm_rc6_residency',
@@ -229,6 +227,8 @@ intel_i915_progs = [
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',
+	'perf',
+	'perf_pmu',
 	'prime_busy',
 	'prime_mmap',
 	'prime_mmap_coherency',
@@ -371,7 +371,6 @@ extra_sources = {
 # Extra dependencies used on core and Intel drivers
 extra_dependencies = {
 	'core_hotunplug': [ lib_igt_i915_perf ],
-	'drm_fdinfo': [ lib_igt_drm_fdinfo ],
 	'dumb_buffer':  [ libatomic ],
 	'gem_barrier_race': [ lib_igt_i915_perf ],
 	'gem_create': [ libatomic ],
@@ -380,6 +379,7 @@ extra_dependencies = {
 	'gem_eio': [ realtime ],
 	'gem_exec_balancer': [ lib_igt_perf ],
 	'gem_mmap_offset': [ libatomic ],
+	'i915_fdinfo': [ lib_igt_drm_fdinfo ],
 	'i915_pm_freq_mult': [ lib_igt_perf ],
 	'i915_pm_rc6_residency': [ lib_igt_perf ],
 	'perf': [ lib_igt_i915_perf ],
-- 
2.47.0