aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-08 09:41:34 -0400
committerDave Airlie <airlied@redhat.com>2013-08-19 00:29:24 -0400
commitcb6458f97b53d7f73043206c18014b3ca63ac345 (patch)
tree3494b20eb61635f9ba5905e4ed19375e478ad26c /include/drm
parent7d14bb6b537414ffe6a8641cb14088465c28460d (diff)
drm: remove procfs code, take 2
So almost two years ago I've tried to nuke the procfs code already once before: http://lists.freedesktop.org/archives/dri-devel/2011-October/015707.html The conclusion was that userspace drivers (specifically libdrm device node detection) stopped relying on procfs in 2001. But after some digging it turned out that the drmstat tool in libdrm is still using those files (but only when certain options are set). So we've decided to keep profcs. But I when I've started to dig around again what exactly this tool does I've noticed that it tries to read the "mem", "vm", and "vma" files from procfs. Now as far my git history digging shows "mem" never did anything useful (at least in the version that first showed up in upstream history in 2004) and the file was remove in commit 955b12def42e83287c1bdb1411d99451753c1391 Author: Ben Gamari <bgamari@gmail.com> Date: Tue Feb 17 20:08:49 2009 -0500 drm: Convert proc files to seq_file and introduce debugfs Which means that for over 4 years drmstat has been broken, and no one cared. In my opinion that's proof enough that no one is actually using drmstat, and so that we can savely nuke the procfs support from drm. While at it fix up the error case cleanup for debugfs in drm_get_minor. v2: Fix dates, libdrm stopped relying on procfs for drm node detection in 2001. v3: fixup compilation warning for !CONFIG_DEBUG_FS, reported by Fengguang Wu. Cc: kbuild test robot <fengguang.wu@intel.com> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 808eb237be0e..39911dca359b 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -45,7 +45,6 @@
45#include <linux/kernel.h> 45#include <linux/kernel.h>
46#include <linux/miscdevice.h> 46#include <linux/miscdevice.h>
47#include <linux/fs.h> 47#include <linux/fs.h>
48#include <linux/proc_fs.h>
49#include <linux/init.h> 48#include <linux/init.h>
50#include <linux/file.h> 49#include <linux/file.h>
51#include <linux/platform_device.h> 50#include <linux/platform_device.h>
@@ -1027,8 +1026,6 @@ struct drm_minor {
1027 struct device kdev; /**< Linux device */ 1026 struct device kdev; /**< Linux device */
1028 struct drm_device *dev; 1027 struct drm_device *dev;
1029 1028
1030 struct proc_dir_entry *proc_root; /**< proc directory entry */
1031 struct drm_info_node proc_nodes;
1032 struct dentry *debugfs_root; 1029 struct dentry *debugfs_root;
1033 1030
1034 struct list_head debugfs_list; 1031 struct list_head debugfs_list;
@@ -1438,17 +1435,12 @@ extern unsigned int drm_timestamp_precision;
1438extern unsigned int drm_timestamp_monotonic; 1435extern unsigned int drm_timestamp_monotonic;
1439 1436
1440extern struct class *drm_class; 1437extern struct class *drm_class;
1441extern struct proc_dir_entry *drm_proc_root;
1442extern struct dentry *drm_debugfs_root; 1438extern struct dentry *drm_debugfs_root;
1443 1439
1444extern struct idr drm_minors_idr; 1440extern struct idr drm_minors_idr;
1445 1441
1446extern struct drm_local_map *drm_getsarea(struct drm_device *dev); 1442extern struct drm_local_map *drm_getsarea(struct drm_device *dev);
1447 1443
1448 /* Proc support (drm_proc.h) */
1449extern int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root);
1450extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);
1451
1452 /* Debugfs support */ 1444 /* Debugfs support */
1453#if defined(CONFIG_DEBUG_FS) 1445#if defined(CONFIG_DEBUG_FS)
1454extern int drm_debugfs_init(struct drm_minor *minor, int minor_id, 1446extern int drm_debugfs_init(struct drm_minor *minor, int minor_id,