Skip to content

Commit 6abf2fc

Browse files
committed
drm/i915/debugfs: move debug printing to intel_display_power.c
The debugfs should have no special privileges to look into the implementation guts. Move the actual debug printing of power domains to intel_display_power.c. Cc: Imre Deak <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 497520c commit 6abf2fc

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -471,28 +471,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_edp_psr_debug_fops,
471471

472472
static int i915_power_domain_info(struct seq_file *m, void *unused)
473473
{
474-
struct drm_i915_private *dev_priv = node_to_i915(m->private);
475-
struct i915_power_domains *power_domains = &dev_priv->power_domains;
476-
int i;
477-
478-
mutex_lock(&power_domains->lock);
479-
480-
seq_printf(m, "%-25s %s\n", "Power well/domain", "Use count");
481-
for (i = 0; i < power_domains->power_well_count; i++) {
482-
struct i915_power_well *power_well;
483-
enum intel_display_power_domain power_domain;
484-
485-
power_well = &power_domains->power_wells[i];
486-
seq_printf(m, "%-25s %d\n", power_well->desc->name,
487-
power_well->count);
488-
489-
for_each_power_domain(power_domain, power_well->desc->domains)
490-
seq_printf(m, " %-23s %d\n",
491-
intel_display_power_domain_str(power_domain),
492-
power_domains->domain_use_count[power_domain]);
493-
}
474+
struct drm_i915_private *i915 = node_to_i915(m->private);
494475

495-
mutex_unlock(&power_domains->lock);
476+
intel_display_power_debug(i915, m);
496477

497478
return 0;
498479
}

drivers/gpu/drm/i915/display/intel_display_power.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6397,3 +6397,28 @@ void intel_display_power_resume(struct drm_i915_private *i915)
63976397
hsw_disable_pc8(i915);
63986398
}
63996399
}
6400+
6401+
void intel_display_power_debug(struct drm_i915_private *i915, struct seq_file *m)
6402+
{
6403+
struct i915_power_domains *power_domains = &i915->power_domains;
6404+
int i;
6405+
6406+
mutex_lock(&power_domains->lock);
6407+
6408+
seq_printf(m, "%-25s %s\n", "Power well/domain", "Use count");
6409+
for (i = 0; i < power_domains->power_well_count; i++) {
6410+
struct i915_power_well *power_well;
6411+
enum intel_display_power_domain power_domain;
6412+
6413+
power_well = &power_domains->power_wells[i];
6414+
seq_printf(m, "%-25s %d\n", power_well->desc->name,
6415+
power_well->count);
6416+
6417+
for_each_power_domain(power_domain, power_well->desc->domains)
6418+
seq_printf(m, " %-23s %d\n",
6419+
intel_display_power_domain_str(power_domain),
6420+
power_domains->domain_use_count[power_domain]);
6421+
}
6422+
6423+
mutex_unlock(&power_domains->lock);
6424+
}

drivers/gpu/drm/i915/display/intel_display_power.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,8 @@ intel_display_power_put_all_in_set(struct drm_i915_private *i915,
391391
intel_display_power_put_mask_in_set(i915, power_domain_set, power_domain_set->mask);
392392
}
393393

394+
void intel_display_power_debug(struct drm_i915_private *i915, struct seq_file *m);
395+
394396
/*
395397
* FIXME: We should probably switch this to a 0-based scheme to be consistent
396398
* with how we now name/number DBUF_CTL instances.

0 commit comments

Comments
 (0)