Skip to content

Commit

Permalink
drm/i915: rename debugfs_gt_pm files
Browse files Browse the repository at this point in the history
We shouldn't be using debugfs_ namespace for this functionality. Rename
debugfs_gt_pm.[ch] to intel_gt_pm_debugfs.[ch] and then make
functions, defines and structs follow suit.

Signed-off-by: Lucas De Marchi <[email protected]>
Acked-by: Jani Nikula <[email protected]>
Reviewed-by: Matt Roper <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
lucasdemarchi committed Sep 19, 2021
1 parent 00142bc commit 23f6a82
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o

# "Graphics Technology" (aka we talk to the gpu)
gt-y += \
gt/debugfs_gt_pm.o \
gt/gen2_engine_cs.o \
gt/gen6_engine_cs.o \
gt/gen6_ppgtt.o \
Expand All @@ -102,6 +101,7 @@ gt-y += \
gt/intel_gt_engines_debugfs.o \
gt/intel_gt_irq.o \
gt/intel_gt_pm.o \
gt/intel_gt_pm_debugfs.o \
gt/intel_gt_pm_irq.o \
gt/intel_gt_requests.o \
gt/intel_gtt.o \
Expand Down
14 changes: 0 additions & 14 deletions drivers/gpu/drm/i915/gt/debugfs_gt_pm.h

This file was deleted.

4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gt/intel_gt_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#include <linux/debugfs.h>

#include "debugfs_gt_pm.h"
#include "i915_drv.h"
#include "intel_gt_debugfs.h"
#include "intel_gt_engines_debugfs.h"
#include "intel_gt_pm_debugfs.h"
#include "intel_sseu_debugfs.h"
#include "uc/intel_uc_debugfs.h"

Expand All @@ -24,7 +24,7 @@ void intel_gt_debugfs_register(struct intel_gt *gt)
return;

intel_gt_engines_debugfs_register(gt, root);
debugfs_gt_pm_register(gt, root);
intel_gt_pm_debugfs_register(gt, root);
intel_sseu_debugfs_register(gt, root);

intel_uc_debugfs_register(&gt->uc, root);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

#include <linux/seq_file.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_gt_pm_debugfs.h"
#include "intel_llc.h"
#include "intel_rc6.h"
#include "intel_rps.h"
Expand Down Expand Up @@ -614,7 +614,7 @@ static bool rps_eval(void *data)

DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE(rps_boost);

void debugfs_gt_pm_register(struct intel_gt *gt, struct dentry *root)
void intel_gt_pm_debugfs_register(struct intel_gt *gt, struct dentry *root)
{
static const struct intel_gt_debugfs_file files[] = {
{ "drpc", &drpc_fops, NULL },
Expand Down
14 changes: 14 additions & 0 deletions drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2019 Intel Corporation
*/

#ifndef INTEL_GT_PM_DEBUGFS_H
#define INTEL_GT_PM_DEBUGFS_H

struct intel_gt;
struct dentry;

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

#endif /* INTEL_GT_PM_DEBUGFS_H */

0 comments on commit 23f6a82

Please sign in to comment.