drm/i915: Fix HSW debugfs frequency print
Subsystems (2)
PATCH 1/1 drm/i915: Fix HSW debugfs frequency print
We need to do the print after we've done the math.
This was broken when we introduced VLV support. Personally, I think the interface should go away now that we support it in sysfs. Historically it has allowed users to do stupid things which we might not allow in the sysfs interface - so we can keep it I guess.
commit 0a073b843bcd9a660f76e497182aac97cafddc4c
Author: Jesse Barnes <[email protected]> Date: Wed Apr 17 15:54:58 2013 -0700
drm/i915: turbo & RC6 support for VLV v7
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -3230,8 +3230,6 @@ i915_max_freq_set(void *data, u64 val)flush_delayed_work (&dev_priv->rps.delayed_resume_work); -DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock);if (ret)return ret;
@@ -3249,6 +3247,8 @@ i915_max_freq_set(void *data, u64 val)gen6_set_rps (dev, val); } +DRM_DEBUG_DRIVER ("Manually set max freq to %llu\n" , val); +mutex_unlock (&dev_priv->rps.hw_lock);return 0 ;
Signature · 1 line
1.8.5.3
Blargh.... this isn't specific to HSW. Title should be s/HSW/gen6|gen7/
Quoted 44 lines · Ben Widawsky
We need to do the print after we've done the math.
This was broken when we introduced VLV support. Personally, I think the interface should go away now that we support it in sysfs. Historically it has allowed users to do stupid things which we might not allow in the sysfs interface - so we can keep it I guess.
commit
0a073b843bcd9a660f76e497182aac97cafddc4cAuthor: Jesse Barnes <[email protected]> Date: Wed Apr 17 15:54:58 2013 -0700drm/i915: turbo & RC6 support for VLV v7
Reported-by Rao, Ram R <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-2@@ -3230,8 +3230,6 @@ i915_max_freq_set(void *data, u64 val)flush_delayed_work (&dev_priv->rps.delayed_resume_work); -DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock);if (ret)return ret;@@ -3249,6 +3247,8 @@ i915_max_freq_set(void *data, u64 val)gen6_set_rps (dev, val); } +DRM_DEBUG_DRIVER ("Manually set max freq to %llu\n" , val); +mutex_unlock (&dev_priv->rps.hw_lock);return 0 ;Signature · 1 line
1.8.5.3
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Quoted 1 line · Ben Widawsky
Blargh.... this isn't specific to HSW. Title should be s/HSW/gen6|gen7/
Fixed and merged to dinq.
-Daniel
Quoted 53 lines · Ben Widawsky
Quoted 44 lines
We need to do the print after we've done the math.
This was broken when we introduced VLV support. Personally, I think the interface should go away now that we support it in sysfs. Historically it has allowed users to do stupid things which we might not allow in the sysfs interface - so we can keep it I guess.
commit
0a073b843bcd9a660f76e497182aac97cafddc4cAuthor: Jesse Barnes <[email protected]> Date: Wed Apr 17 15:54:58 2013 -0700drm/i915: turbo & RC6 support for VLV v7
Reported-by Rao, Ram R <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-2@@ -3230,8 +3230,6 @@ i915_max_freq_set(void *data, u64 val)flush_delayed_work (&dev_priv->rps.delayed_resume_work); -DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock);if (ret)return ret;@@ -3249,6 +3247,8 @@ i915_max_freq_set(void *data, u64 val)gen6_set_rps (dev, val); } +DRM_DEBUG_DRIVER ("Manually set max freq to %llu\n" , val); +mutex_unlock (&dev_priv->rps.hw_lock);return 0 ;Signature · 1 line
1.8.5.3Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch