Merge tag 'drm-intel-next-2022-05-20' of git://anongit.freedesktop.org/drm/drm-intel...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gt / intel_gt_pm_debugfs.c

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c
index b3fa6607da7eacf5f3938b64cda723cae7af5e6a..90a4408650378ab7e7601852821475f278cc4af3 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c
@@ -24,38 +24,38 @@
 #include "intel_uncore.h"
 #include "vlv_sideband.h"
 
-int intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt)
+void intel_gt_pm_debugfs_forcewake_user_open(struct intel_gt *gt)
 {
        atomic_inc(&gt->user_wakeref);
        intel_gt_pm_get(gt);
        if (GRAPHICS_VER(gt->i915) >= 6)
                intel_uncore_forcewake_user_get(gt->uncore);
-
-       return 0;
 }
 
-int intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt)
+void intel_gt_pm_debugfs_forcewake_user_release(struct intel_gt *gt)
 {
        if (GRAPHICS_VER(gt->i915) >= 6)
                intel_uncore_forcewake_user_put(gt->uncore);
        intel_gt_pm_put(gt);
        atomic_dec(&gt->user_wakeref);
-
-       return 0;
 }
 
 static int forcewake_user_open(struct inode *inode, struct file *file)
 {
        struct intel_gt *gt = inode->i_private;
 
-       return intel_gt_pm_debugfs_forcewake_user_open(gt);
+       intel_gt_pm_debugfs_forcewake_user_open(gt);
+
+       return 0;
 }
 
 static int forcewake_user_release(struct inode *inode, struct file *file)
 {
        struct intel_gt *gt = inode->i_private;
 
-       return intel_gt_pm_debugfs_forcewake_user_release(gt);
+       intel_gt_pm_debugfs_forcewake_user_release(gt);
+
+       return 0;
 }
 
 static const struct file_operations forcewake_user_fops = {
@@ -342,17 +342,16 @@ void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *p)
        } else if (GRAPHICS_VER(i915) >= 6) {
                u32 rp_state_limits;
                u32 gt_perf_status;
-               u32 rp_state_cap;
+               struct intel_rps_freq_caps caps;
                u32 rpmodectl, rpinclimit, rpdeclimit;
                u32 rpstat, cagf, reqf;
                u32 rpcurupei, rpcurup, rpprevup;
                u32 rpcurdownei, rpcurdown, rpprevdown;
                u32 rpupei, rpupt, rpdownei, rpdownt;
                u32 pm_ier, pm_imr, pm_isr, pm_iir, pm_mask;
-               int max_freq;
 
                rp_state_limits = intel_uncore_read(uncore, GEN6_RP_STATE_LIMITS);
-               rp_state_cap = intel_rps_read_state_cap(rps);
+               gen6_rps_get_freq_caps(rps, &caps);
                if (IS_GEN9_LP(i915))
                        gt_perf_status = intel_uncore_read(uncore, BXT_GT_PERF_STATUS);
                else
@@ -474,25 +473,12 @@ void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *p)
                drm_printf(p, "RP DOWN THRESHOLD: %d (%lldns)\n",
                           rpdownt, intel_gt_pm_interval_to_ns(gt, rpdownt));
 
-               max_freq = (IS_GEN9_LP(i915) ? rp_state_cap >> 0 :
-                           rp_state_cap >> 16) & 0xff;
-               max_freq *= (IS_GEN9_BC(i915) ||
-                            GRAPHICS_VER(i915) >= 11 ? GEN9_FREQ_SCALER : 1);
                drm_printf(p, "Lowest (RPN) frequency: %dMHz\n",
-                          intel_gpu_freq(rps, max_freq));
-
-               max_freq = (rp_state_cap & 0xff00) >> 8;
-               max_freq *= (IS_GEN9_BC(i915) ||
-                            GRAPHICS_VER(i915) >= 11 ? GEN9_FREQ_SCALER : 1);
+                          intel_gpu_freq(rps, caps.min_freq));
                drm_printf(p, "Nominal (RP1) frequency: %dMHz\n",
-                          intel_gpu_freq(rps, max_freq));
-
-               max_freq = (IS_GEN9_LP(i915) ? rp_state_cap >> 16 :
-                           rp_state_cap >> 0) & 0xff;
-               max_freq *= (IS_GEN9_BC(i915) ||
-                            GRAPHICS_VER(i915) >= 11 ? GEN9_FREQ_SCALER : 1);
+                          intel_gpu_freq(rps, caps.rp1_freq));
                drm_printf(p, "Max non-overclocked (RP0) frequency: %dMHz\n",
-                          intel_gpu_freq(rps, max_freq));
+                          intel_gpu_freq(rps, caps.rp0_freq));
                drm_printf(p, "Max overclocked frequency: %dMHz\n",
                           intel_gpu_freq(rps, rps->max_freq));