First check in for DRM that splits core from personality modules

1 files changed, 44 insertions, 133 deletions

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index a09f08b8..00188b8c 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -31,10 +31,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/module.h>
 #include "drmP.h"
+#include "drm_core.h"
 
-static unsigned int cards_limit = 16;	/* Enough for one machine */
-static unsigned int debug = 0;		/* 1 to enable debug output */
+unsigned int cards_limit = 16;	/* Enough for one machine */
+unsigned int debug = 0;		/* 1 to enable debug output */
 
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
@@ -45,7 +47,9 @@ MODULE_PARM_DESC(debug, "Enable debug output");
 module_param(cards_limit, int, 0444);
 module_param(debug, int, 0666);
 
-drm_global_t *DRM(global);
+drm_minor_t *drm_minors;
+struct drm_sysfs_class *drm_class;
+struct proc_dir_entry *drm_proc_root;
 
 /**
  * File \c open operation.
@@ -65,10 +69,10 @@ static int stub_open(struct inode *inode, struct file *filp)
 	
 	DRM_DEBUG("\n");
 
-	if (!((minor >= 0) && (minor < DRM(global)->cards_limit)))
+	if (!((minor >= 0) && (minor < cards_limit)))
 		return -ENODEV;
 
-	dev = DRM(global)->minors[minor].dev;
+	dev = drm_minors[minor].dev;
 	if (!dev)
 		return -ENODEV;
 
@@ -84,56 +88,57 @@ static int stub_open(struct inode *inode, struct file *filp)
 }
 
 /** File operations structure */
-static struct file_operations DRM(stub_fops) = {
+struct file_operations drm_stub_fops = {
 	.owner = THIS_MODULE,
 	.open  = stub_open
 };
 
 
 /**
- * Get a device minor number.
+ * Register.
  *
- * \param pdev PCI device structure
+ * \param pdev - PCI device structure
  * \param ent entry from the PCI ID table with device type flags
- * \return negative number on failure.
+ * \return zero on success or a negative number on failure.
  *
- * Search an empty entry and initialize it to the given parameters, and 
- * create the proc init entry via proc_init().
+ * Attempt to gets inter module "drm" information. If we are first
+ * then register the character device and inter module information.
+ * Try and register, if we fail to register, backout previous work.
  */
-static int get_minor(struct pci_dev *pdev, const struct pci_device_id *ent)
+int drm_probe(struct pci_dev *pdev, const struct pci_device_id *ent, struct drm_driver_fn *driver_fn)
 {
 	struct class_device *dev_class;
 	drm_device_t *dev;
 	int ret;
 	int minor;
-	drm_minor_t *minors = &DRM(global)->minors[0];
+	drm_minor_t *minors = &drm_minors[0];
 
 	DRM_DEBUG("\n");
 
-	for (minor = 0; minor < DRM(global)->cards_limit; minor++, minors++) {
+	for (minor = 0; minor < cards_limit; minor++, minors++) {
 		if (minors->class == DRM_MINOR_FREE) {
 
 			DRM_DEBUG("assigning minor %d\n", minor);
-			dev = DRM(calloc)(1, sizeof(*dev), DRM_MEM_STUB);
+			dev = drm_calloc(1, sizeof(*dev), DRM_MEM_STUB);
 			if(!dev) 
 				return -ENOMEM;
 
 			*minors = (drm_minor_t){.dev = dev, .class = DRM_MINOR_PRIMARY};
 			dev->minor = minor;
-			if ((ret = DRM(fill_in_dev)(dev, pdev, ent))) {
+			if ((ret = drm_fill_in_dev(dev, pdev, ent, driver_fn))) {
 				printk (KERN_ERR "DRM: Fill_in_dev failed.\n");
 				goto err_g1;
 			}
-			if ((ret = DRM(proc_init)(dev, minor, DRM(global)->proc_root, &minors->dev_root))) {
+			if ((ret = drm_proc_init(dev, minor, drm_proc_root, &minors->dev_root))) {
 				printk (KERN_ERR "DRM: Failed to initialize /proc/dri.\n");
 				goto err_g1;
 			}
-			if (!DRM(fb_loaded)) {
+			if (!drm_fb_loaded) {
 				pci_set_drvdata(pdev, dev);
 				pci_request_regions(pdev, DRIVER_NAME);
 				pci_enable_device(pdev);
 			}
-			dev_class = DRM(sysfs_device_add)(DRM(global)->drm_class, 
+			dev_class = drm_sysfs_device_add(drm_class,
 					MKDEV(DRM_MAJOR, minor), DRM_PCI_DEV(pdev), "card%d", minor);
 			if (IS_ERR(dev_class)) {
 				printk (KERN_ERR "DRM: Error sysfs_device_add.\n");
@@ -148,17 +153,18 @@ static int get_minor(struct pci_dev *pdev, const struct pci_device_id *ent)
 	DRM_ERROR("out of minors\n");
 	return -ENOMEM;
 err_g2:
-	if (!DRM(fb_loaded)) {
+	if (!drm_fb_loaded) {
 		pci_set_drvdata(pdev, NULL);
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);
 	}
-	DRM(proc_cleanup)(minor, DRM(global)->proc_root, minors->dev_root);
+	drm_proc_cleanup(minor, drm_proc_root, minors->dev_root);
 err_g1:
 	*minors = (drm_minor_t){.dev = NULL, .class = DRM_MINOR_FREE};
-	DRM(free)(dev, sizeof(*dev), DRM_MEM_STUB);
+	drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
 	return ret;
 }
+EXPORT_SYMBOL(drm_probe);
 
 /**
  * Get a secondary minor number.
@@ -171,25 +177,25 @@ err_g1:
  * create the proc init entry via proc_init(). This routines assigns
  * minor numbers to secondary heads of multi-headed cards
  */
-int DRM(get_secondary_minor)(drm_device_t *dev, drm_minor_t **sec_minor)
+int drm_get_secondary_minor(drm_device_t *dev, drm_minor_t **sec_minor)
 {
-	drm_minor_t *minors = &DRM(global)->minors[0];
+	drm_minor_t *minors = &drm_minors[0];
 	struct class_device *dev_class;
 	int ret;
 	int minor;
 
 	DRM_DEBUG("\n");
 
-	for (minor = 0; minor < DRM(global)->cards_limit; minor++, minors++) {
+	for (minor = 0; minor < cards_limit; minor++, minors++) {
 		if (minors->class == DRM_MINOR_FREE) {
 
 			*minors = (drm_minor_t){.dev = dev, .class = DRM_MINOR_SECONDARY};
-			if ((ret = DRM(proc_init)(dev, minor, DRM(global)->proc_root, &minors->dev_root))) {
+			if ((ret = drm_proc_init(dev, minor, drm_proc_root, &minors->dev_root))) {
 				printk (KERN_ERR "DRM: Failed to initialize /proc/dri.\n");
 				goto err_g1;
 			}
 
-			dev_class = DRM(sysfs_device_add)(DRM(global)->drm_class, 
+			dev_class = drm_sysfs_device_add(drm_class,
 					MKDEV(DRM_MAJOR, minor), DRM_PCI_DEV(dev->pdev), "card%d", minor);
 			if (IS_ERR(dev_class)) {
 				printk (KERN_ERR "DRM: Error sysfs_device_add.\n");
@@ -205,10 +211,10 @@ int DRM(get_secondary_minor)(drm_device_t *dev, drm_minor_t **sec_minor)
 	DRM_ERROR("out of minors\n");
 	return -ENOMEM;
 err_g2:
-	DRM(proc_cleanup)(minor, DRM(global)->proc_root, minors->dev_root);
+	drm_proc_cleanup(minor, drm_proc_root, minors->dev_root);
 err_g1:
 	*minors = (drm_minor_t){.dev = NULL, .class = DRM_MINOR_FREE};
-	DRM(free)(dev, sizeof(*dev), DRM_MEM_STUB);
+	drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
 	return ret;
 }
 
@@ -222,38 +228,17 @@ err_g1:
  * "drm" data, otherwise unregisters the "drm" data, frees the dev list and
  * unregisters the character device. 
  */
-int DRM(put_minor)(drm_device_t *dev)
+int drm_put_minor(drm_device_t *dev)
 {
-	drm_minor_t *minors = &DRM(global)->minors[dev->minor];
-	int i;
+	drm_minor_t *minors = &drm_minors[dev->minor];
 	
 	DRM_DEBUG("release primary minor %d\n", dev->minor);
 
-	DRM(proc_cleanup)(dev->minor, DRM(global)->proc_root, minors->dev_root);
-	DRM(sysfs_device_remove)(MKDEV(DRM_MAJOR, dev->minor));
+	drm_proc_cleanup(dev->minor, drm_proc_root, minors->dev_root);
+	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);
-
-	/* if any device pointers are non-NULL we are not the last module */
-	for (i = 0; i < DRM(global)->cards_limit; i++) {
-		if (DRM(global)->minors[i].class != DRM_MINOR_FREE) {
-			DRM_DEBUG("inter_module_put called\n");
-			inter_module_put("drm");
-			return 0;
-		}
-	}
-	DRM_DEBUG("unregistering inter_module \n");
-	inter_module_unregister("drm");
-	remove_proc_entry("dri", NULL);
-	DRM(sysfs_destroy)(DRM(global)->drm_class);
-
-	unregister_chrdev(DRM_MAJOR, "drm");
-
-	DRM(free)(DRM(global)->minors, sizeof(*DRM(global)->minors) *
-				DRM(global)->cards_limit, DRM_MEM_STUB);
-	DRM(free)(DRM(global), sizeof(*DRM(global)), DRM_MEM_STUB);
-	DRM(global) = NULL;
+	drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
 
 	return 0;
 }
@@ -268,91 +253,17 @@ int DRM(put_minor)(drm_device_t *dev)
  * last minor released.
  * 
  */
-int DRM(put_secondary_minor)(drm_minor_t *sec_minor)
+int drm_put_secondary_minor(drm_minor_t *sec_minor)
 {
-	int minor = sec_minor - &DRM(global)->minors[0];
+	int minor = sec_minor - &drm_minors[0];
 
 	DRM_DEBUG("release secondary minor %d\n", minor);
 
-	DRM(proc_cleanup)(minor, DRM(global)->proc_root, sec_minor->dev_root);
-	DRM(sysfs_device_remove)(MKDEV(DRM_MAJOR, minor));
+	drm_proc_cleanup(minor, drm_proc_root, sec_minor->dev_root);
+	drm_sysfs_device_remove(MKDEV(DRM_MAJOR, minor));
 
 	*sec_minor = (drm_minor_t){.dev = NULL, .class = DRM_MINOR_FREE};
 
 	return 0;
 }
 
-/**
- * Register.
- *
- * \param pdev - PCI device structure
- * \param ent entry from the PCI ID table with device type flags
- * \return zero on success or a negative number on failure.
- *
- * Attempt to gets inter module "drm" information. If we are first
- * then register the character device and inter module information.
- * Try and register, if we fail to register, backout previous work.
- */
-int DRM(probe)(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-	drm_global_t *global;
-	int ret = -ENOMEM;
-
-	DRM_DEBUG("\n");
-
-	/* use the inter_module_get to check - as if the same module
-		registers chrdev twice it succeeds */
-	global = (drm_global_t *)inter_module_get("drm");
-	if (global) {
-		DRM(global) = global;
-		global = NULL;
-	} else {
-		DRM_DEBUG("first probe\n");
-
-		global = DRM(calloc)(1, sizeof(*global), DRM_MEM_STUB);
-		if(!global) 
-			return -ENOMEM;
-
-		global->cards_limit = (cards_limit < DRM_MAX_MINOR + 1 ? cards_limit : DRM_MAX_MINOR + 1);
-		global->minors = DRM(calloc)(global->cards_limit, 
-					sizeof(*global->minors), DRM_MEM_STUB);
-		if(!global->minors) 
-			goto err_p1;
-
-		if (register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops)))
-			goto err_p1;
-	
-		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);
-			goto err_p2;
-		}
-
-		global->proc_root = create_proc_entry("dri", S_IFDIR, NULL);
-		if (!global->proc_root) {
-			DRM_ERROR("Cannot create /proc/dri\n");
-			ret = -1;
-			goto err_p3;
-		}
-		DRM_DEBUG("calling inter_module_register\n");
-		inter_module_register("drm", THIS_MODULE, global);
-		
-		DRM(global) = global;
-	}
-	if ((ret = get_minor(pdev, ent))) {
-		if (global)
-			goto err_p3;
-		return ret;
-	}
-	return 0;
-err_p3:
-	DRM(sysfs_destroy)(global->drm_class);
-err_p2:
-	unregister_chrdev(DRM_MAJOR, "drm");
-	DRM(free)(global->minors, sizeof(*global->minors) * global->cards_limit, DRM_MEM_STUB);
-err_p1:	
-	DRM(free)(global, sizeof(*global), DRM_MEM_STUB);
-	DRM(global) = NULL;
-	return ret;
-}