Commit 00142bce authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210918025754.1254705-2-lucas.demarchi@intel.com
parent 022f324c

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/gt/intel_gt_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/gt/debugfs_engines.c→drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 


#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"

#include "intel_gt_engines_debugfs.h"



static int engines_show(struct seq_file *m, void *data)

{
@@ -26,7 +26,7 @@ static int engines_show(struct seq_file *m, void *data) 
}

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(engines);



void debugfs_engines_register(struct intel_gt *gt, struct dentry *root)

void intel_gt_engines_debugfs_register(struct intel_gt *gt, struct dentry *root)

{

	static const struct intel_gt_debugfs_file files[] = {

		{ "engines", &engines_fops },

drivers/gpu/drm/i915/gt/debugfs_engines.h→drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h

+14 −0
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
 * Copyright © 2019 Intel Corporation

 */



#ifndef DEBUGFS_ENGINES_H

#define DEBUGFS_ENGINES_H

#ifndef INTEL_GT_ENGINES_DEBUGFS_H

#define INTEL_GT_ENGINES_DEBUGFS_H



struct intel_gt;

struct dentry;



void debugfs_engines_register(struct intel_gt *gt, struct dentry *root);

void intel_gt_engines_debugfs_register(struct intel_gt *gt, struct dentry *root);



#endif /* DEBUGFS_ENGINES_H */
 
#endif /* INTEL_GT_ENGINES_DEBUGFS_H */