diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2014-08-30 11:50:59 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-03 06:38:33 -0400 |
commit | 1ed1ef9dd91ef8067a45889367a888c7494675e0 (patch) | |
tree | 9afecde4ebe762ed6c7678d37f30bc9688fbf38d | |
parent | 059b2fe9d8a7ae570b803ca7b71ef9a3628c2aa4 (diff) |
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>
-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) | |||
2628 | return 0; | 2628 | return 0; |
2629 | } | 2629 | } |
2630 | 2630 | ||
2631 | static int intel_wa_registers(struct seq_file *m, void *unused) | 2631 | static int i915_wa_registers(struct seq_file *m, void *unused) |
2632 | { | 2632 | { |
2633 | int i; | 2633 | int i; |
2634 | int ret; | 2634 | int ret; |
@@ -4198,7 +4198,7 @@ static const struct drm_info_list i915_debugfs_list[] = { | |||
4198 | {"i915_semaphore_status", i915_semaphore_status, 0}, | 4198 | {"i915_semaphore_status", i915_semaphore_status, 0}, |
4199 | {"i915_shared_dplls_info", i915_shared_dplls_info, 0}, | 4199 | {"i915_shared_dplls_info", i915_shared_dplls_info, 0}, |
4200 | {"i915_dp_mst_info", i915_dp_mst_info, 0}, | 4200 | {"i915_dp_mst_info", i915_dp_mst_info, 0}, |
4201 | {"intel_wa_registers", intel_wa_registers, 0} | 4201 | {"i915_wa_registers", i915_wa_registers, 0}, |
4202 | }; | 4202 | }; |
4203 | #define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) | 4203 | #define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) |
4204 | 4204 | ||