This code switches DRM off from class simple to it's own internal
sysfs code. You need to do this in order to add attributes. The
attached code adds a simple "version" attribute. More attributes are
planned once the initial framework is in place.
This code has a bunch of ifdef kernel versions in it. Is there a
better way to do this? It also contains some overall clean up on the
way to a drm_core model.
drm_sysfs.h is a GPL derivative of drivers/base/class_simple.c
Note the DRM() macros around function names can not be removed until
we convert to drm_core.
The register_chardev_range() is to free up some minor numbers for VGA
devices when the driver gets written. If VGA gets it's own major we
can switch back to register_chardev().
--
Jon Smirl
[EMAIL PROTECTED]
diff -Nru a/linux/Makefile b/linux/Makefile
--- a/linux/Makefile 2004-09-22 18:08:04 -04:00
+++ b/linux/Makefile 2004-09-22 18:08:04 -04:00
@@ -69,7 +69,8 @@
DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
drm_drv.h drm_fops.h drm_init.h drm_ioctl.h drm_irq.h \
- drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h
+ drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h \
+ drm_sysfs.h drm_core.h
DRMSHARED = drm.h drm_sarea.h
DRMHEADERS = drmP.h $(DRMSHARED)
diff -Nru a/linux/drmP.h b/linux/drmP.h
--- a/linux/drmP.h 2004-09-22 18:08:04 -04:00
+++ b/linux/drmP.h 2004-09-22 18:08:04 -04:00
@@ -56,7 +56,9 @@
#include <linux/smp_lock.h> /* For (un)lock_kernel */
#include <linux/mm.h>
#include <linux/pagemap.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <linux/cdev.h>
+#endif
#if defined(__alpha__) || defined(__powerpc__)
#include <asm/pgtable.h> /* For pte_wrprotect */
#endif
@@ -693,7 +695,7 @@
typedef struct drm_global {
unsigned int cards_limit;
drm_minor_t *minors;
- struct class_simple *drm_class;
+ struct drm_sysfs_class *drm_class;
struct proc_dir_entry *proc_root;
struct cdev drm_cdev;
} drm_global_t;
diff -Nru a/linux/drm_compat.h b/linux/drm_compat.h
--- a/linux/drm_compat.h 2004-09-22 18:08:04 -04:00
+++ b/linux/drm_compat.h 2004-09-22 18:08:04 -04:00
@@ -108,22 +108,25 @@
#define old_encode_dev(x) (x)
-struct class_simple;
+struct drm_sysfs_class;
struct device;
#define pci_dev_put(x) do {} while (0)
#define pci_get_subsys pci_find_subsys
-#define class_simple_device_add(...) do {} while (0)
+#define DRM(sysfs_device_add)(...) do {} while (0)
-static inline void class_simple_device_remove(dev_t dev){}
+static inline void DRM(sysfs_device_remove)(dev_t dev){}
-static inline void class_simple_destroy(struct class_simple *cs){}
+static inline void DRM(sysfs_destroy)(struct class_simple *cs){}
-static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return (struct class_simple *)owner; }
+static inline struct drm_sysfs_class *DRM(sysfs_create)(struct module *owner, char *name) { return (struct class_simple *)owner; }
#ifndef pci_pretty_name
#define pci_pretty_name(x) x->name
+
+struct cdev {};
+
#endif
#endif
diff -Nru a/linux/drm_core.h b/linux/drm_core.h
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/linux/drm_core.h 2004-09-22 18:08:04 -04:00
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2004 Jon Smirl <[EMAIL PROTECTED]>
+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "drm_auth.h"
+#include "drm_agpsupport.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_irq.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_pci.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_sysfs.h"
+#include "drm_stub.h"
+#include "drm_scatter.h"
diff -Nru a/linux/drm_stub.h b/linux/drm_stub.h
--- a/linux/drm_stub.h 2004-09-22 18:08:04 -04:00
+++ b/linux/drm_stub.h 2004-09-22 18:08:04 -04:00
@@ -135,10 +135,10 @@
pci_request_regions(pdev, DRIVER_NAME);
pci_enable_device(pdev);
}
- dev_class = class_simple_device_add(DRM(global)->drm_class,
+ dev_class = DRM(sysfs_device_add)(DRM(global)->drm_class,
MKDEV(DRM_MAJOR, minor), &pdev->dev, "card%d", minor);
if (IS_ERR(dev_class)) {
- printk (KERN_ERR "DRM: Error class_simple_device_add.\n");
+ printk (KERN_ERR "DRM: Error sysfs_device_add.\n");
ret = PTR_ERR(dev_class);
goto err_g2;
}
@@ -191,10 +191,10 @@
goto err_g1;
}
- dev_class = class_simple_device_add(DRM(global)->drm_class,
+ dev_class = DRM(sysfs_device_add)(DRM(global)->drm_class,
MKDEV(DRM_MAJOR, minor), &dev->pdev->dev, "card%d", minor);
if (IS_ERR(dev_class)) {
- printk (KERN_ERR "DRM: Error class_simple_device_add.\n");
+ printk (KERN_ERR "DRM: Error sysfs_device_add.\n");
ret = PTR_ERR(dev_class);
goto err_g2;
}
@@ -232,7 +232,7 @@
DRM_DEBUG("release primary minor %d\n", dev->minor);
DRM(proc_cleanup)(dev->minor, DRM(global)->proc_root, minors->dev_root);
- class_simple_device_remove(MKDEV(DRM_MAJOR, dev->minor));
+ DRM(sysfs_device_remove)(MKDEV(DRM_MAJOR, dev->minor));
*minors = (drm_minor_t){.dev = NULL, .class = DRM_MINOR_FREE};
DRM(free)(dev, sizeof(*dev), DRM_MEM_STUB);
@@ -248,9 +248,13 @@
DRM_DEBUG("unregistering inter_module \n");
inter_module_unregister("drm");
remove_proc_entry("dri", NULL);
- class_simple_destroy(DRM(global)->drm_class);
+ DRM(sysfs_destroy)(DRM(global)->drm_class);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
cdev_del(&DRM(global)->drm_cdev);
unregister_chrdev_region(MKDEV(DRM_MAJOR, 0), DRM_MAX_MINOR);
+#else
+ unregister_chrdev(MKDEV(DRM_MAJOR, 0));
+#endif
DRM(free)(DRM(global)->minors, sizeof(*DRM(global)->minors) *
DRM(global)->cards_limit, DRM_MEM_STUB);
@@ -277,7 +281,7 @@
DRM_DEBUG("release secondary minor %d\n", minor);
DRM(proc_cleanup)(minor, DRM(global)->proc_root, sec_minor->dev_root);
- class_simple_device_remove(MKDEV(DRM_MAJOR, minor));
+ DRM(sysfs_device_remove)(MKDEV(DRM_MAJOR, minor));
*sec_minor = (drm_minor_t){.dev = NULL, .class = DRM_MINOR_FREE};
@@ -322,6 +326,7 @@
if(!global->minors)
goto err_p1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
if (register_chrdev_region(dev, DRM_MAX_MINOR, "drm"))
goto err_p1;
@@ -333,8 +338,12 @@
printk (KERN_ERR "DRM: Error registering drm major number.\n");
goto err_p2;
}
+#else
+ if (register_chrdev(dev, "drm"))
+ goto err_p1;
+#endif
- global->drm_class = class_simple_create(THIS_MODULE, "drm");
+ global->drm_class = DRM(sysfs_create)(THIS_MODULE, "drm");
if (IS_ERR(global->drm_class)) {
printk (KERN_ERR "DRM: Error creating drm class.\n");
ret = PTR_ERR(global->drm_class);
@@ -359,10 +368,14 @@
}
return 0;
err_p4:
- class_simple_destroy(global->drm_class);
+ DRM(sysfs_destroy)(global->drm_class);
err_p3:
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
cdev_del(&global->drm_cdev);
unregister_chrdev_region(dev, DRM_MAX_MINOR);
+#else
+ unregister_chrdev(dev);
+#endif
err_p2:
DRM(free)(global->minors, sizeof(*global->minors) * global->cards_limit, DRM_MEM_STUB);
err_p1:
diff -Nru a/linux/drm_sysfs.h b/linux/drm_sysfs.h
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/linux/drm_sysfs.h 2004-09-22 18:08:04 -04:00
@@ -0,0 +1,206 @@
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+/*
+ * drm_sysfs.c - Modifications to drm_sysfs_class.c to support
+ * extra sysfs attribute from DRM. Normal drm_sysfs_class
+ * does not allow adding attributes.
+ *
+ * Copyright (c) 2004 Jon Smirl <[EMAIL PROTECTED]>
+ * Copyright (c) 2003-2004 Greg Kroah-Hartman <[EMAIL PROTECTED]>
+ * Copyright (c) 2003-2004 IBM Corp.
+ *
+ * This file is released under the GPLv2
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/device.h>
+#include <linux/kdev_t.h>
+#include <linux/err.h>
+
+struct drm_sysfs_class {
+ struct class_device_attribute attr;
+ struct class class;
+};
+#define to_drm_sysfs_class(d) container_of(d, struct drm_sysfs_class, class)
+
+struct simple_dev {
+ struct list_head node;
+ dev_t dev;
+ struct class_device class_dev;
+};
+#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
+
+static LIST_HEAD(simple_dev_list);
+static spinlock_t simple_dev_list_lock = SPIN_LOCK_UNLOCKED;
+
+static void release_simple_dev(struct class_device *class_dev)
+{
+ struct simple_dev *s_dev = to_simple_dev(class_dev);
+ kfree(s_dev);
+}
+
+static ssize_t show_dev(struct class_device *class_dev, char *buf)
+{
+ struct simple_dev *s_dev = to_simple_dev(class_dev);
+ return print_dev_t(buf, s_dev->dev);
+}
+
+static void drm_sysfs_class_release(struct class *class)
+{
+ struct drm_sysfs_class *cs = to_drm_sysfs_class(class);
+ kfree(cs);
+}
+
+/* Display the version of drm_core. This doesn't work right in current design */
+static ssize_t version_show(struct class *dev, char *buf)
+{
+ return sprintf(buf, "fixme for drm_core %s %d.%d.%d %s\n", DRIVER_NAME, DRIVER_MAJOR,
+ DRIVER_MINOR, DRIVER_PATCHLEVEL, DRIVER_DATE);
+}
+static CLASS_ATTR(version, S_IRUGO, version_show, NULL);
+
+/**
+ * DRM(sysfs_create) - create a struct drm_sysfs_class structure
+ * @owner: pointer to the module that is to "own" this struct drm_sysfs_class
+ * @name: pointer to a string for the name of this class.
+ *
+ * This is used to create a struct drm_sysfs_class pointer that can then be used
+ * in calls to DRM(sysfs_device_add)().
+ *
+ * Note, the pointer created here is to be destroyed when finished by making a
+ * call to DRM(sysfs_destroy)().
+ */
+struct drm_sysfs_class *DRM(sysfs_create)(struct module *owner, char *name)
+{
+ struct drm_sysfs_class *cs;
+ int retval;
+
+ cs = kmalloc(sizeof(*cs), GFP_KERNEL);
+ if (!cs) {
+ retval = -ENOMEM;
+ goto error;
+ }
+ memset(cs, 0x00, sizeof(*cs));
+
+ cs->class.name = name;
+ cs->class.class_release = drm_sysfs_class_release;
+ cs->class.release = release_simple_dev;
+
+ cs->attr.attr.name = "dev";
+ cs->attr.attr.mode = S_IRUGO;
+ cs->attr.attr.owner = owner;
+ cs->attr.show = show_dev;
+ cs->attr.store = NULL;
+
+ retval = class_register(&cs->class);
+ if (retval)
+ goto error;
+ class_create_file(&cs->class, &class_attr_version);
+
+ return cs;
+
+error:
+ kfree(cs);
+ return ERR_PTR(retval);
+}
+
+/**
+ * DRM(sysfs_destroy) - destroys a struct drm_sysfs_class structure
+ * @cs: pointer to the struct drm_sysfs_class that is to be destroyed
+ *
+ * Note, the pointer to be destroyed must have been created with a call to
+ * DRM(sysfs_create)().
+ */
+void DRM(sysfs_destroy)(struct drm_sysfs_class *cs)
+{
+ if ((cs == NULL) || (IS_ERR(cs)))
+ return;
+
+ class_unregister(&cs->class);
+}
+
+/**
+ * DRM(sysfs_device_add) - adds a class device to sysfs for a character driver
+ * @cs: pointer to the struct drm_sysfs_class that this device should be registered to.
+ * @dev: the dev_t for the device to be added.
+ * @device: a pointer to a struct device that is assiociated with this class device.
+ * @fmt: string for the class device's name
+ *
+ * A struct class_device will be created in sysfs, registered to the specified
+ * class. A "dev" file will be created, showing the dev_t for the device. The
+ * pointer to the struct class_device will be returned from the call. Any further
+ * sysfs files that might be required can be created using this pointer.
+ * Note: the struct drm_sysfs_class passed to this function must have previously been
+ * created with a call to DRM(sysfs_create)().
+ */
+struct class_device *DRM(sysfs_device_add)(struct drm_sysfs_class *cs, dev_t dev, struct device *device, const char *fmt, ...)
+{
+ va_list args;
+ struct simple_dev *s_dev = NULL;
+ int retval;
+
+ if ((cs == NULL) || (IS_ERR(cs))) {
+ retval = -ENODEV;
+ goto error;
+ }
+
+ s_dev = kmalloc(sizeof(*s_dev), GFP_KERNEL);
+ if (!s_dev) {
+ retval = -ENOMEM;
+ goto error;
+ }
+ memset(s_dev, 0x00, sizeof(*s_dev));
+
+ s_dev->dev = dev;
+ s_dev->class_dev.dev = device;
+ s_dev->class_dev.class = &cs->class;
+
+ va_start(args, fmt);
+ vsnprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, fmt, args);
+ va_end(args);
+ retval = class_device_register(&s_dev->class_dev);
+ if (retval)
+ goto error;
+
+ class_device_create_file(&s_dev->class_dev, &cs->attr);
+
+ spin_lock(&simple_dev_list_lock);
+ list_add(&s_dev->node, &simple_dev_list);
+ spin_unlock(&simple_dev_list_lock);
+
+ return &s_dev->class_dev;
+
+error:
+ kfree(s_dev);
+ return ERR_PTR(retval);
+}
+
+/**
+ * DRM(sysfs_device_remove) - removes a class device that was created with DRM(sysfs_device_add)()
+ * @dev: the dev_t of the device that was previously registered.
+ *
+ * This call unregisters and cleans up a class device that was created with a
+ * call to DRM(sysfs_device_add)()
+ */
+void DRM(sysfs_device_remove)(dev_t dev)
+{
+ struct simple_dev *s_dev = NULL;
+ int found = 0;
+
+ spin_lock(&simple_dev_list_lock);
+ list_for_each_entry(s_dev, &simple_dev_list, node) {
+ if (s_dev->dev == dev) {
+ found = 1;
+ break;
+ }
+ }
+ if (found) {
+ list_del(&s_dev->node);
+ spin_unlock(&simple_dev_list_lock);
+ class_device_unregister(&s_dev->class_dev);
+ } else {
+ spin_unlock(&simple_dev_list_lock);
+ }
+}
+
+#endif
diff -Nru a/linux/ffb_drv.c b/linux/ffb_drv.c
--- a/linux/ffb_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/ffb_drv.c 2004-09-22 18:08:04 -04:00
@@ -237,12 +237,7 @@
return addr;
}
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
+#include "drm_core.h"
/* This functions must be here since it references DRM(numdevs)
* which drm_drv.h declares.
@@ -281,11 +276,3 @@
return ret;
}
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
diff -Nru a/linux/i810_drv.c b/linux/i810_drv.c
--- a/linux/i810_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/i810_drv.c 2004-09-22 18:08:04 -04:00
@@ -37,21 +37,4 @@
#include "i810_drm.h"
#include "i810_drv.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/i830_drv.c b/linux/i830_drv.c
--- a/linux/i830_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/i830_drv.c 2004-09-22 18:08:04 -04:00
@@ -39,21 +39,4 @@
#include "i830_drm.h"
#include "i830_drv.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/i915_drv.c b/linux/i915_drv.c
--- a/linux/i915_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/i915_drv.c 2004-09-22 18:08:04 -04:00
@@ -14,20 +14,4 @@
#include "i915_drm.h"
#include "i915_drv.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h" /* is this needed? */
-#include "drm_bufs.h"
-#include "drm_context.h" /* is this needed? */
-#include "drm_drawable.h" /* is this needed? */
-#include "drm_dma.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_irq.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h" /* */
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/mach64_drv.c b/linux/mach64_drv.c
--- a/linux/mach64_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/mach64_drv.c 2004-09-22 18:08:04 -04:00
@@ -34,21 +34,4 @@
#include "mach64_drm.h"
#include "mach64_drv.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_irq.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_pci.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/mga_drv.c b/linux/mga_drv.c
--- a/linux/mga_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/mga_drv.c 2004-09-22 18:08:04 -04:00
@@ -35,20 +35,5 @@
#include "drm.h"
#include "mga_drm.h"
#include "mga_drv.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+
+#include "drm_core.h"
diff -Nru a/linux/r128_drv.c b/linux/r128_drv.c
--- a/linux/r128_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/r128_drv.c 2004-09-22 18:08:04 -04:00
@@ -37,20 +37,4 @@
#include "r128_drv.h"
#include "ati_pcigart.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/radeon_drv.c b/linux/radeon_drv.c
--- a/linux/radeon_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/radeon_drv.c 2004-09-22 18:08:04 -04:00
@@ -38,20 +38,4 @@
#include "radeon_drv.h"
#include "ati_pcigart.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
diff -Nru a/linux/savage_drv.c b/linux/savage_drv.c
--- a/linux/savage_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/savage_drv.c 2004-09-22 18:08:04 -04:00
@@ -250,23 +250,6 @@
#endif /* end #if 0 */
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
-
+#include "drm_core.h"
diff -Nru a/linux/sis_drv.c b/linux/sis_drv.c
--- a/linux/sis_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/sis_drv.c 2004-09-22 18:08:04 -04:00
@@ -31,22 +31,5 @@
#include "sis_drm.h"
#include "sis_drv.h"
-#include "drm_auth.h"
-#include "drm_agpsupport.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_irq.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
-
+#include "drm_core.h"
diff -Nru a/linux/tdfx_drv.c b/linux/tdfx_drv.c
--- a/linux/tdfx_drv.c 2004-09-22 18:08:04 -04:00
+++ b/linux/tdfx_drv.c 2004-09-22 18:08:04 -04:00
@@ -34,24 +34,7 @@
#include "tdfx.h"
#include "drmP.h"
-#include "drm_agpsupport.h"
-#include "drm_auth.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#include "drm_core.h"
void DRM(driver_register_fns)(drm_device_t *dev)
{
diff -Nru a/shared/via_drv.c b/shared/via_drv.c
--- a/shared/via_drv.c 2004-09-22 18:08:04 -04:00
+++ b/shared/via_drv.c 2004-09-22 18:08:04 -04:00
@@ -52,21 +52,4 @@
[DRM_IOCTL_NR(DRM_IOCTL_VIA_PCICMD)] = { via_pci_cmdbuffer, 1, 0}
-#include "drm_auth.h"
-#include "drm_agpsupport.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_irq.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
-
+#include "drm_core.h"
