drm/i915: rename debugfs_engines files

We shouldn't be using debugfs_ namespace for this functionality. Rename
debugfs_engines.[ch] to intel_gt_engines_debugfs.[ch] and then make
functions, defines and structs follow suit.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210918025754.1254705-2-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 7eab4edae2b676ba52f041ecca797cfd4b19a416..3c68909d9066dcf63fa0b016cfb98b17cd4fa553 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -78,7 +78,6 @@ i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
 
 # "Graphics Technology" (aka we talk to the gpu)
 gt-y += \
-       gt/debugfs_engines.o \
        gt/debugfs_gt_pm.o \
        gt/gen2_engine_cs.o \
        gt/gen6_engine_cs.o \
@@ -100,6 +99,7 @@ gt-y += \
        gt/intel_gt_buffer_pool.o \
        gt/intel_gt_clock_utils.o \
        gt/intel_gt_debugfs.o \
+       gt/intel_gt_engines_debugfs.o \
        gt/intel_gt_irq.o \
        gt/intel_gt_pm.o \
        gt/intel_gt_pm_irq.o \

diff --git a/drivers/gpu/drm/i915/gt/debugfs_engines.c b/drivers/gpu/drm/i915/gt/debugfs_engines.c
deleted file mode 100644 (file)
index 2980dac..0000000
--- a/drivers/gpu/drm/i915/gt/debugfs_engines.c
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-/*
- * Copyright © 2019 Intel Corporation
- */
-
-#include <drm/drm_print.h>
-
-#include "debugfs_engines.h"
-#include "i915_drv.h" /* for_each_engine! */
-#include "intel_engine.h"
-#include "intel_gt_debugfs.h"
-
-static int engines_show(struct seq_file *m, void *data)
-{
-       struct intel_gt *gt = m->private;
-       struct intel_engine_cs *engine;
-       enum intel_engine_id id;
-       struct drm_printer p;
-
-       p = drm_seq_file_printer(m);
-       for_each_engine(engine, gt, id)
-               intel_engine_dump(engine, &p, "%s\n", engine->name);
-
-       return 0;
-}
-DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(engines);
-
-void debugfs_engines_register(struct intel_gt *gt, struct dentry *root)
-{
-       static const struct intel_gt_debugfs_file files[] = {
-               { "engines", &engines_fops },
-       };
-
-       intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), gt);
-}

diff --git a/drivers/gpu/drm/i915/gt/debugfs_engines.h b/drivers/gpu/drm/i915/gt/debugfs_engines.h
deleted file mode 100644 (file)
index f69257e..0000000
--- a/drivers/gpu/drm/i915/gt/debugfs_engines.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2019 Intel Corporation
- */
-
-#ifndef DEBUGFS_ENGINES_H
-#define DEBUGFS_ENGINES_H
-
-struct intel_gt;
-struct dentry;
-
-void debugfs_engines_register(struct intel_gt *gt, struct dentry *root);
-
-#endif /* DEBUGFS_ENGINES_H */

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c
index b196480082653fab84e1f4b37073ea5ee97aba39..3c77c2965e194a0e20dde356e3f00e1184fee53d 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_debugfs.c
@@ -5,10 +5,10 @@
 
 #include <linux/debugfs.h>
 
-#include "debugfs_engines.h"
 #include "debugfs_gt_pm.h"
 #include "i915_drv.h"
 #include "intel_gt_debugfs.h"
+#include "intel_gt_engines_debugfs.h"
 #include "intel_sseu_debugfs.h"
 #include "uc/intel_uc_debugfs.h"
 
@@ -23,7 +23,7 @@ void intel_gt_debugfs_register(struct intel_gt *gt)
        if (IS_ERR(root))
                return;
 
-       debugfs_engines_register(gt, root);
+       intel_gt_engines_debugfs_register(gt, root);
        debugfs_gt_pm_register(gt, root);
        intel_sseu_debugfs_register(gt, root);
 

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c
new file mode 100644 (file)
index 0000000..8f9b874
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include <drm/drm_print.h>
+
+#include "i915_drv.h" /* for_each_engine! */
+#include "intel_engine.h"
+#include "intel_gt_debugfs.h"
+#include "intel_gt_engines_debugfs.h"
+
+static int engines_show(struct seq_file *m, void *data)
+{
+       struct intel_gt *gt = m->private;
+       struct intel_engine_cs *engine;
+       enum intel_engine_id id;
+       struct drm_printer p;
+
+       p = drm_seq_file_printer(m);
+       for_each_engine(engine, gt, id)
+               intel_engine_dump(engine, &p, "%s\n", engine->name);
+
+       return 0;
+}
+DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(engines);
+
+void intel_gt_engines_debugfs_register(struct intel_gt *gt, struct dentry *root)
+{
+       static const struct intel_gt_debugfs_file files[] = {
+               { "engines", &engines_fops },
+       };
+
+       intel_gt_debugfs_register_files(root, files, ARRAY_SIZE(files), gt);
+}

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h b/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h
new file mode 100644 (file)
index 0000000..dda1134
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef INTEL_GT_ENGINES_DEBUGFS_H
+#define INTEL_GT_ENGINES_DEBUGFS_H
+
+struct intel_gt;
+struct dentry;
+
+void intel_gt_engines_debugfs_register(struct intel_gt *gt, struct dentry *root);
+
+#endif /* INTEL_GT_ENGINES_DEBUGFS_H */