From: Ben Widawsky <ben@bwidawsk.net>
Date: Wed, 11 May 2011 22:10:58 +0000 (-0700)
Subject: drm/i915: forcewake debugfs fix
X-Git-Tag: v3.0-rc3~42^2~49^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8eb572942ca02890f590d9251233038e27dd3842;p=~emulex%2Finfiniband.git

drm/i915: forcewake debugfs fix

Forcewake needs to register itself with drm to use the remove function.

The file also should be read only.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index c0ce5e44ac3..183eaac8980 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1383,13 +1383,13 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor)
 	struct dentry *ent;
 
 	ent = debugfs_create_file("i915_forcewake_user",
-				  S_IRWXU,
+				  S_IRUSR,
 				  root, dev,
 				  &i915_forcewake_fops);
 	if (IS_ERR(ent))
 		return PTR_ERR(ent);
 
-	return 0;
+	return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops);
 }
 
 static struct drm_info_list i915_debugfs_list[] = {