Commit 022f324c authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: rename debugfs_gt files 



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

While at it and since we are renaming the header, sort the includes
alphabetically.

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-1-lucas.demarchi@intel.com
parent 48b09612

drivers/gpu/drm/i915/Makefile

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

	gt/intel_gt_buffer_pool.o \

	gt/intel_gt_clock_utils.o \

	gt/intel_gt_debugfs.o \

	gt/intel_gt_irq.o \

	gt/intel_gt_pm.o \

	gt/intel_gt_pm_irq.o \

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

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
#include <drm/drm_print.h>



#include "debugfs_engines.h"

#include "debugfs_gt.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)

{
@@ -24,11 +24,11 @@ static int engines_show(struct seq_file *m, void *data) 


	return 0;

}

DEFINE_GT_DEBUGFS_ATTRIBUTE(engines);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(engines);



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

{

	static const struct debugfs_gt_file files[] = {

	static const struct intel_gt_debugfs_file files[] = {

		{ "engines", &engines_fops },

	};

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

+7 −7
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


#include <linux/seq_file.h>



#include "debugfs_gt.h"

#include "debugfs_gt_pm.h"

#include "i915_drv.h"

#include "intel_gt.h"

#include "intel_gt_clock_utils.h"

#include "intel_gt_debugfs.h"

#include "intel_gt_pm.h"

#include "intel_llc.h"

#include "intel_rc6.h"
@@ -36,7 +36,7 @@ static int fw_domains_show(struct seq_file *m, void *data) 


	return 0;

}

DEFINE_GT_DEBUGFS_ATTRIBUTE(fw_domains);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(fw_domains);



static void print_rc6_res(struct seq_file *m,

			  const char *title,
@@ -238,7 +238,7 @@ static int drpc_show(struct seq_file *m, void *unused) 


	return err;

}

DEFINE_GT_DEBUGFS_ATTRIBUTE(drpc);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(drpc);



static int frequency_show(struct seq_file *m, void *unused)

{
@@ -480,7 +480,7 @@ static int frequency_show(struct seq_file *m, void *unused) 


	return 0;

}

DEFINE_GT_DEBUGFS_ATTRIBUTE(frequency);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(frequency);



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

{
@@ -533,7 +533,7 @@ static bool llc_eval(void *data) 
	return HAS_LLC(gt->i915);

}



DEFINE_GT_DEBUGFS_ATTRIBUTE(llc);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(llc);



static const char *rps_power_to_str(unsigned int power)

{
@@ -612,11 +612,11 @@ static bool rps_eval(void *data) 
	return HAS_RPS(gt->i915);

}



DEFINE_GT_DEBUGFS_ATTRIBUTE(rps_boost);

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(rps_boost);



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

{

	static const struct debugfs_gt_file files[] = {

	static const struct intel_gt_debugfs_file files[] = {

		{ "drpc", &drpc_fops, NULL },

		{ "frequency", &frequency_fops, NULL },

		{ "forcewake", &fw_domains_fops, NULL },

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

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

 */



#include "debugfs_gt.h"

#include "intel_gt_debugfs.h"



#include "gem/i915_gem_lmem.h"

#include "i915_drv.h"
@@ -15,11 +15,11 @@ 
#include "intel_gt_requests.h"

#include "intel_migrate.h"

#include "intel_mocs.h"

#include "intel_pm.h"

#include "intel_rc6.h"

#include "intel_renderstate.h"

#include "intel_rps.h"

#include "intel_uncore.h"

#include "intel_pm.h"

#include "shmem_utils.h"



void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)
@@ -434,7 +434,7 @@ void intel_gt_driver_register(struct intel_gt *gt) 
{

	intel_rps_driver_register(&gt->rps);



	debugfs_gt_register(gt);

	intel_gt_debugfs_register(gt);

}



static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)

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

+4 −4
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
#include <linux/debugfs.h>



#include "debugfs_engines.h"

#include "debugfs_gt.h"

#include "debugfs_gt_pm.h"

#include "i915_drv.h"

#include "intel_gt_debugfs.h"

#include "intel_sseu_debugfs.h"

#include "uc/intel_uc_debugfs.h"

#include "i915_drv.h"



void debugfs_gt_register(struct intel_gt *gt)

void intel_gt_debugfs_register(struct intel_gt *gt)

{

	struct dentry *root;
@@ -31,7 +31,7 @@ void debugfs_gt_register(struct intel_gt *gt) 
}



void intel_gt_debugfs_register_files(struct dentry *root,

				     const struct debugfs_gt_file *files,

				     const struct intel_gt_debugfs_file *files,

				     unsigned long count, void *data)

{

	while (count--) {