aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-24 03:44:28 -0500
committerKeith Packard <keithp@keithp.com>2012-01-24 16:29:25 -0500
commit075edca43b819c33bd755eaf7a3bd0e1b3279f70 (patch)
tree9a94d556702074c891dad7b521c1a6fd9f208d00
parent04115a9dee110b52a8eaa556c574022fa3bf4704 (diff)
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>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c4
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)
1669 struct drm_i915_private *dev_priv = dev->dev_private; 1669 struct drm_i915_private *dev_priv = dev->dev_private;
1670 int ret; 1670 int ret;
1671 1671
1672 if (!IS_GEN6(dev)) 1672 if (INTEL_INFO(dev)->gen < 6)
1673 return 0; 1673 return 0;
1674 1674
1675 ret = mutex_lock_interruptible(&dev->struct_mutex); 1675 ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1686,7 +1686,7 @@ int i915_forcewake_release(struct inode *inode, struct file *file)
1686 struct drm_device *dev = inode->i_private; 1686 struct drm_device *dev = inode->i_private;
1687 struct drm_i915_private *dev_priv = dev->dev_private; 1687 struct drm_i915_private *dev_priv = dev->dev_private;
1688 1688
1689 if (!IS_GEN6(dev)) 1689 if (INTEL_INFO(dev)->gen < 6)
1690 return 0; 1690 return 0;
1691 1691
1692 /* 1692 /*