diff options
| author | Daniel Vetter | 2012-01-24 09:44:28 +0100 |
|---|---|---|
| committer | Keith Packard | 2012-01-24 22:29:25 +0100 |
| commit | 075edca43b819c33bd755eaf7a3bd0e1b3279f70 (patch) | |
| tree | 9a94d556702074c891dad7b521c1a6fd9f208d00 /drivers/gpu/drm | |
| parent | drm/i915: Re-enable gen7 RC6 and GPU turbo after resume. (diff) | |
| download | kernel-qcow2-linux-075edca43b819c33bd755eaf7a3bd0e1b3279f70.tar.gz kernel-qcow2-linux-075edca43b819c33bd755eaf7a3bd0e1b3279f70.tar.xz kernel-qcow2-linux-075edca43b819c33bd755eaf7a3bd0e1b3279f70.zip | |
drm/i915: allow userspace forcewake references also on gen7
We need this to correctly access registers in the gt power well from
userspace.
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 60dcee3eda44..6b7204638603 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1669,7 +1669,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) struct drm_i915_private *dev_priv = dev->dev_private; int ret; - if (!IS_GEN6(dev)) + if (INTEL_INFO(dev)->gen < 6) return 0; ret = mutex_lock_interruptible(&dev->struct_mutex); @@ -1686,7 +1686,7 @@ int i915_forcewake_release(struct inode *inode, struct file *file) struct drm_device *dev = inode->i_private; struct drm_i915_private *dev_priv = dev->dev_private; - if (!IS_GEN6(dev)) + if (INTEL_INFO(dev)->gen < 6) return 0; /* |