[PATCH i-g-t v6 1/2] tests/intel: rename drm_fdinfo into i915_drm_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.

v2: correct Tvrto address (Kamil)
v3: removed from xe.blocklist and squashed into one patch (Lucas)
v4: corrected lib dependency in meson.build (Kamil)
v5: drop sorting other tests in meson.build (Kamil)
v6: use i915_drm_fdinfo as there is xe_drm_fdinfo (Lucas)
  correct test name in documentation (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_drm_fdinfo.c} | 2 +-
 tests/meson.build                               | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename tests/intel/{drm_fdinfo.c => i915_drm_fdinfo.c} (99%)

diff --git a/tests/intel-ci/xe.blocklist.txt b/tests/intel-ci/xe.blocklist.txt
index d02d0f73e..506a6001e 100644
--- a/tests/intel-ci/xe.blocklist.txt
+++ b/tests/intel-ci/xe.blocklist.txt
@@ -38,7 +38,6 @@ igt at xe_live_ktest@xe_bo_shrink
 ##################################################################
 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_drm_fdinfo.c
similarity index 99%
rename from tests/intel/drm_fdinfo.c
rename to tests/intel/i915_drm_fdinfo.c
index 3c1f0a739..f5aadc9eb 100644
--- a/tests/intel/drm_fdinfo.c
+++ b/tests/intel/i915_drm_fdinfo.c
@@ -34,7 +34,7 @@
 #include "i915/gem_vm.h"
 #include "intel_ctx.h"
 /**
- * TEST: drm fdinfo
+ * TEST: i915 drm 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 9224145cf..8cb3fc4d2 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -88,7 +88,6 @@ intel_i915_xe_progs = [
 
 intel_i915_progs = [
 	'api_intel_bb',
-	'drm_fdinfo',
 	'gen3_mixed_blits',
 	'gen3_render_linear_blits',
 	'gen3_render_mixed_blits',
@@ -213,6 +212,7 @@ intel_i915_progs = [
 	'gem_workarounds',
 	'perf',
 	'perf_pmu',
+	'i915_drm_fdinfo',
 	'i915_fb_tiling',
 	'i915_getparams_basic',
 	'i915_pm_freq_api',
@@ -386,7 +386,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 ],
@@ -395,6 +394,7 @@ extra_dependencies = {
 	'gem_eio': [ realtime ],
 	'gem_exec_balancer': [ lib_igt_perf ],
 	'gem_mmap_offset': [ libatomic ],
+	'i915_drm_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.49.0