Message ID | 20180314093748.8541-20-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 3/14/2018 3:07 PM, Chris Wilson wrote: > A more complete, and more importantly stable, interface for controlling > the RPS frequency range is available in sysfs, obsoleting the unstable > debugfs. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> (I'm assuming we don't want to mention "getters" in subject as it is trivial and obvious :) ) > --- > drivers/gpu/drm/i915/i915_debugfs.c | 115 ------------------------------------ > 1 file changed, 115 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 5965df3e6215..034fb7cfc80e 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -4136,119 +4136,6 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops, > i915_drop_caches_get, i915_drop_caches_set, > "0x%08llx\n"); > > -static int > -i915_max_freq_get(void *data, u64 *val) > -{ > - struct drm_i915_private *dev_priv = data; > - > - if (INTEL_GEN(dev_priv) < 6) > - return -ENODEV; > - > - *val = intel_gpu_freq(dev_priv, dev_priv->gt_pm.rps.max_freq_softlimit); > - return 0; > -} > - > -static int > -i915_max_freq_set(void *data, u64 val) > -{ > - struct drm_i915_private *dev_priv = data; > - struct intel_rps *rps = &dev_priv->gt_pm.rps; > - u32 hw_max, hw_min; > - int ret; > - > - if (INTEL_GEN(dev_priv) < 6) > - return -ENODEV; > - > - DRM_DEBUG_DRIVER("Manually setting max freq to %llu\n", val); > - > - ret = mutex_lock_interruptible(&rps->lock); > - if (ret) > - return ret; > - > - /* > - * Turbo will still be enabled, but won't go above the set value. > - */ > - val = intel_freq_opcode(dev_priv, val); > - > - hw_max = rps->max_freq; > - hw_min = rps->min_freq; > - > - if (val < hw_min || val > hw_max || val < rps->min_freq_softlimit) { > - ret = -EINVAL; > - goto unlock; > - } > - > - rps->max_freq_softlimit = val; > - > - if (intel_set_rps(dev_priv, val)) > - DRM_DEBUG_DRIVER("failed to update RPS to new softlimit\n"); > - > -unlock: > - mutex_unlock(&rps->lock); > - return ret; > -} > - > -DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops, > - i915_max_freq_get, i915_max_freq_set, > - "%llu\n"); > - > -static int > -i915_min_freq_get(void *data, u64 *val) > -{ > - struct drm_i915_private *dev_priv = data; > - > - if (INTEL_GEN(dev_priv) < 6) > - return -ENODEV; > - > - *val = intel_gpu_freq(dev_priv, dev_priv->gt_pm.rps.min_freq_softlimit); > - return 0; > -} > - > -static int > -i915_min_freq_set(void *data, u64 val) > -{ > - struct drm_i915_private *dev_priv = data; > - struct intel_rps *rps = &dev_priv->gt_pm.rps; > - u32 hw_max, hw_min; > - int ret; > - > - if (INTEL_GEN(dev_priv) < 6) > - return -ENODEV; > - > - DRM_DEBUG_DRIVER("Manually setting min freq to %llu\n", val); > - > - ret = mutex_lock_interruptible(&rps->lock); > - if (ret) > - return ret; > - > - /* > - * Turbo will still be enabled, but won't go below the set value. > - */ > - val = intel_freq_opcode(dev_priv, val); > - > - hw_max = rps->max_freq; > - hw_min = rps->min_freq; > - > - if (val < hw_min || > - val > hw_max || val > rps->max_freq_softlimit) { > - ret = -EINVAL; > - goto unlock; > - } > - > - rps->min_freq_softlimit = val; > - > - if (intel_set_rps(dev_priv, val)) > - DRM_DEBUG_DRIVER("failed to update RPS to new softlimit\n"); > - > -unlock: > - mutex_unlock(&rps->lock); > - return ret; > -} > - > -DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops, > - i915_min_freq_get, i915_min_freq_set, > - "%llu\n"); > - > static int > i915_cache_sharing_get(void *data, u64 *val) > { > @@ -4749,8 +4636,6 @@ static const struct i915_debugfs_files { > const struct file_operations *fops; > } i915_debugfs_files[] = { > {"i915_wedged", &i915_wedged_fops}, > - {"i915_max_freq", &i915_max_freq_fops}, > - {"i915_min_freq", &i915_min_freq_fops}, > {"i915_cache_sharing", &i915_cache_sharing_fops}, > {"i915_ring_missed_irq", &i915_ring_missed_irq_fops}, > {"i915_ring_test_irq", &i915_ring_test_irq_fops},
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 5965df3e6215..034fb7cfc80e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4136,119 +4136,6 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops, i915_drop_caches_get, i915_drop_caches_set, "0x%08llx\n"); -static int -i915_max_freq_get(void *data, u64 *val) -{ - struct drm_i915_private *dev_priv = data; - - if (INTEL_GEN(dev_priv) < 6) - return -ENODEV; - - *val = intel_gpu_freq(dev_priv, dev_priv->gt_pm.rps.max_freq_softlimit); - return 0; -} - -static int -i915_max_freq_set(void *data, u64 val) -{ - struct drm_i915_private *dev_priv = data; - struct intel_rps *rps = &dev_priv->gt_pm.rps; - u32 hw_max, hw_min; - int ret; - - if (INTEL_GEN(dev_priv) < 6) - return -ENODEV; - - DRM_DEBUG_DRIVER("Manually setting max freq to %llu\n", val); - - ret = mutex_lock_interruptible(&rps->lock); - if (ret) - return ret; - - /* - * Turbo will still be enabled, but won't go above the set value. - */ - val = intel_freq_opcode(dev_priv, val); - - hw_max = rps->max_freq; - hw_min = rps->min_freq; - - if (val < hw_min || val > hw_max || val < rps->min_freq_softlimit) { - ret = -EINVAL; - goto unlock; - } - - rps->max_freq_softlimit = val; - - if (intel_set_rps(dev_priv, val)) - DRM_DEBUG_DRIVER("failed to update RPS to new softlimit\n"); - -unlock: - mutex_unlock(&rps->lock); - return ret; -} - -DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops, - i915_max_freq_get, i915_max_freq_set, - "%llu\n"); - -static int -i915_min_freq_get(void *data, u64 *val) -{ - struct drm_i915_private *dev_priv = data; - - if (INTEL_GEN(dev_priv) < 6) - return -ENODEV; - - *val = intel_gpu_freq(dev_priv, dev_priv->gt_pm.rps.min_freq_softlimit); - return 0; -} - -static int -i915_min_freq_set(void *data, u64 val) -{ - struct drm_i915_private *dev_priv = data; - struct intel_rps *rps = &dev_priv->gt_pm.rps; - u32 hw_max, hw_min; - int ret; - - if (INTEL_GEN(dev_priv) < 6) - return -ENODEV; - - DRM_DEBUG_DRIVER("Manually setting min freq to %llu\n", val); - - ret = mutex_lock_interruptible(&rps->lock); - if (ret) - return ret; - - /* - * Turbo will still be enabled, but won't go below the set value. - */ - val = intel_freq_opcode(dev_priv, val); - - hw_max = rps->max_freq; - hw_min = rps->min_freq; - - if (val < hw_min || - val > hw_max || val > rps->max_freq_softlimit) { - ret = -EINVAL; - goto unlock; - } - - rps->min_freq_softlimit = val; - - if (intel_set_rps(dev_priv, val)) - DRM_DEBUG_DRIVER("failed to update RPS to new softlimit\n"); - -unlock: - mutex_unlock(&rps->lock); - return ret; -} - -DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops, - i915_min_freq_get, i915_min_freq_set, - "%llu\n"); - static int i915_cache_sharing_get(void *data, u64 *val) { @@ -4749,8 +4636,6 @@ static const struct i915_debugfs_files { const struct file_operations *fops; } i915_debugfs_files[] = { {"i915_wedged", &i915_wedged_fops}, - {"i915_max_freq", &i915_max_freq_fops}, - {"i915_min_freq", &i915_min_freq_fops}, {"i915_cache_sharing", &i915_cache_sharing_fops}, {"i915_ring_missed_irq", &i915_ring_missed_irq_fops}, {"i915_ring_test_irq", &i915_ring_test_irq_fops},
A more complete, and more importantly stable, interface for controlling the RPS frequency range is available in sysfs, obsoleting the unstable debugfs. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_debugfs.c | 115 ------------------------------------ 1 file changed, 115 deletions(-)