diff options
| author | Damien Lespiau | 2014-08-30 17:50:59 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-09-03 12:38:33 +0200 |
| commit | 1ed1ef9dd91ef8067a45889367a888c7494675e0 (patch) | |
| tree | 9afecde4ebe762ed6c7678d37f30bc9688fbf38d /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915: change CHV write_eld/global_resources function pointers (diff) | |
| download | kernel-qcow2-linux-1ed1ef9dd91ef8067a45889367a888c7494675e0.tar.gz kernel-qcow2-linux-1ed1ef9dd91ef8067a45889367a888c7494675e0.tar.xz kernel-qcow2-linux-1ed1ef9dd91ef8067a45889367a888c7494675e0.zip | |
drm/i915: Rename intel_wa_registers with a i915_ prefix
Those debugfs files are prefixed by i915, the name of the kernel module,
presumably to make the difference with files exposed by core DRM.
Also, add a ',' at the end of the last entry. This is to ease the
conflict resolution when rebasing internal patches that add a member at
the end of the array. Without it, wiggle can't do its job as we need to
modify an existing line (appending the ',').
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 1467cc1a47a9..fc3d582a9530 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2628,7 +2628,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused) return 0; } -static int intel_wa_registers(struct seq_file *m, void *unused) +static int i915_wa_registers(struct seq_file *m, void *unused) { int i; int ret; @@ -4198,7 +4198,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_semaphore_status", i915_semaphore_status, 0}, {"i915_shared_dplls_info", i915_shared_dplls_info, 0}, {"i915_dp_mst_info", i915_dp_mst_info, 0}, - {"intel_wa_registers", intel_wa_registers, 0} + {"i915_wa_registers", i915_wa_registers, 0}, }; #define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) |