drm/i915/guc/slpc: Update boost sysfs hooks for SLPC

Add a helper to sort through the SLPC/RPS paths of get/set methods.
Boost frequency will be modified as long as it is within the constraints
of RP0 and if it is different from the existing one. We will set min
freq to boost only if there is at least one active waiter.

v2: Add num_boosts to guc_slpc_info and changes for worker function
v3: Review comments (Ashutosh)

Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211102012608.8609-4-vinay.belgaumkar@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index 6f310c9d97650623e7d8b9ad5237dc7b81bae460..07ff7ba7b2b715678f3c22c86eb4f6605bea1792 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -936,6 +936,53 @@ void intel_rps_park(struct intel_rps *rps)
        GT_TRACE(rps_to_gt(rps), "park:%x\n", rps->cur_freq);
 }
 
+u32 intel_rps_get_boost_frequency(struct intel_rps *rps)
+{
+       struct intel_guc_slpc *slpc;
+
+       if (rps_uses_slpc(rps)) {
+               slpc = rps_to_slpc(rps);
+
+               return slpc->boost_freq;
+       } else {
+               return intel_gpu_freq(rps, rps->boost_freq);
+       }
+}
+
+static int rps_set_boost_freq(struct intel_rps *rps, u32 val)
+{
+       bool boost = false;
+
+       /* Validate against (static) hardware limits */
+       val = intel_freq_opcode(rps, val);
+       if (val < rps->min_freq || val > rps->max_freq)
+               return -EINVAL;
+
+       mutex_lock(&rps->lock);
+       if (val != rps->boost_freq) {
+               rps->boost_freq = val;
+               boost = atomic_read(&rps->num_waiters);
+       }
+       mutex_unlock(&rps->lock);
+       if (boost)
+               schedule_work(&rps->work);
+
+       return 0;
+}
+
+int intel_rps_set_boost_frequency(struct intel_rps *rps, u32 freq)
+{
+       struct intel_guc_slpc *slpc;
+
+       if (rps_uses_slpc(rps)) {
+               slpc = rps_to_slpc(rps);
+
+               return intel_guc_slpc_set_boost_freq(slpc, freq);
+       } else {
+               return rps_set_boost_freq(rps, freq);
+       }
+}
+
 void intel_rps_dec_waiters(struct intel_rps *rps)
 {
        struct intel_guc_slpc *slpc;

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.h b/drivers/gpu/drm/i915/gt/intel_rps.h
index 407e878d500679be04913f6a9d83964d1b4b5dfd..aee12f37d38aa728c40a5fe38633726b7e60ef15 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rps.h
+++ b/drivers/gpu/drm/i915/gt/intel_rps.h
@@ -24,6 +24,8 @@ void intel_rps_park(struct intel_rps *rps);
 void intel_rps_unpark(struct intel_rps *rps);
 void intel_rps_boost(struct i915_request *rq);
 void intel_rps_dec_waiters(struct intel_rps *rps);
+u32 intel_rps_get_boost_frequency(struct intel_rps *rps);
+int intel_rps_set_boost_frequency(struct intel_rps *rps, u32 freq);
 
 int intel_rps_set(struct intel_rps *rps, u8 val);
 void intel_rps_mark_interactive(struct intel_rps *rps, bool interactive);

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
index db418396a145d91470841f08bed7687a1dd48c50..4e1d3cd291649275144312c4aa01b8d1a1d6bffb 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
@@ -650,6 +650,33 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
        return 0;
 }
 
+int intel_guc_slpc_set_boost_freq(struct intel_guc_slpc *slpc, u32 val)
+{
+       int ret = 0;
+
+       if (val < slpc->min_freq || val > slpc->rp0_freq)
+               return -EINVAL;
+
+       mutex_lock(&slpc->lock);
+
+       if (slpc->boost_freq != val) {
+               /* Apply only if there are active waiters */
+               if (atomic_read(&slpc->num_waiters)) {
+                       ret = slpc_force_min_freq(slpc, val);
+                       if (ret) {
+                               ret = -EIO;
+                               goto done;
+                       }
+               }
+
+               slpc->boost_freq = val;
+       }
+
+done:
+       mutex_unlock(&slpc->lock);
+       return ret;
+}
+
 void intel_guc_slpc_dec_waiters(struct intel_guc_slpc *slpc)
 {
        /*
@@ -687,6 +714,8 @@ int intel_guc_slpc_print_info(struct intel_guc_slpc *slpc, struct drm_printer *p
                                   slpc_decode_max_freq(slpc));
                        drm_printf(p, "\tMin freq: %u MHz\n",
                                   slpc_decode_min_freq(slpc));
+                       drm_printf(p, "\twaitboosts: %u\n",
+                                  slpc->num_boosts);
                }
        }
 

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h
index d74d6d749bdce9a85fce368b80de68a0795c73b3..0caa8fee3c040ec7cdccc68ab8292cda6f4a85f2 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h
@@ -34,6 +34,7 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc);
 void intel_guc_slpc_fini(struct intel_guc_slpc *slpc);
 int intel_guc_slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 val);
 int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val);
+int intel_guc_slpc_set_boost_freq(struct intel_guc_slpc *slpc, u32 val);
 int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val);
 int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val);
 int intel_guc_slpc_print_info(struct intel_guc_slpc *slpc, struct drm_printer *p);

diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 1804f4142740902c83bca27b2cfbaf91ea2d55dc..59d441cedc753ff361d4bfc7813ab6ba7ff52a5d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -279,7 +279,7 @@ static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribu
        struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
        struct intel_rps *rps = &i915->gt.rps;
 
-       return sysfs_emit(buf, "%d\n", intel_gpu_freq(rps, rps->boost_freq));
+       return sysfs_emit(buf, "%d\n", intel_rps_get_boost_frequency(rps));
 }
 
 static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
@@ -288,7 +288,6 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
 {
        struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
        struct intel_rps *rps = &dev_priv->gt.rps;
-       bool boost = false;
        ssize_t ret;
        u32 val;
 
@@ -296,21 +295,9 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
        if (ret)
                return ret;
 
-       /* Validate against (static) hardware limits */
-       val = intel_freq_opcode(rps, val);
-       if (val < rps->min_freq || val > rps->max_freq)
-               return -EINVAL;
-
-       mutex_lock(&rps->lock);
-       if (val != rps->boost_freq) {
-               rps->boost_freq = val;
-               boost = atomic_read(&rps->num_waiters);
-       }
-       mutex_unlock(&rps->lock);
-       if (boost)
-               schedule_work(&rps->work);
+       ret = intel_rps_set_boost_frequency(rps, val);
 
-       return count;
+       return ret ?: count;
 }
 
 static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,