Merge drm/drm-next into drm-intel-gt-next

[linux.git] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 44969f5dde509336d01a00594ae9301cfb0a42a6..04351a8515863be808456a47df912df8ea8be075 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -238,6 +238,7 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
 static int i915_gem_object_info(struct seq_file *m, void *data)
 {
        struct drm_i915_private *i915 = node_to_i915(m->private);
+       struct drm_printer p = drm_seq_file_printer(m);
        struct intel_memory_region *mr;
        enum intel_region_id id;
 
@@ -246,8 +247,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
                   atomic_read(&i915->mm.free_count),
                   i915->mm.shrink_memory);
        for_each_memory_region(mr, i915, id)
-               seq_printf(m, "%s: total:%pa, available:%pa bytes\n",
-                          mr->name, &mr->total, &mr->avail);
+               intel_memory_region_debug(mr, &p);
 
        return 0;
 }
@@ -420,13 +420,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
                int max_freq;
 
                rp_state_limits = intel_uncore_read(&dev_priv->uncore, GEN6_RP_STATE_LIMITS);
-               if (IS_GEN9_LP(dev_priv)) {
-                       rp_state_cap = intel_uncore_read(&dev_priv->uncore, BXT_RP_STATE_CAP);
+               rp_state_cap = intel_rps_read_state_cap(rps);
+               if (IS_GEN9_LP(dev_priv))
                        gt_perf_status = intel_uncore_read(&dev_priv->uncore, BXT_GT_PERF_STATUS);
-               } else {
-                       rp_state_cap = intel_uncore_read(&dev_priv->uncore, GEN6_RP_STATE_CAP);
+               else
                        gt_perf_status = intel_uncore_read(&dev_priv->uncore, GEN6_GT_PERF_STATUS);
-               }
 
                /* RPSTAT1 is in the GT power well */
                intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL);