1 files changed, 50 insertions, 38 deletions

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index 00a24521..cee00c5e 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -37,20 +37,20 @@
 #include "drmP.h"
 #include "drm_core.h"
 
-unsigned int drm_cards_limit = 16;	/* Enough for one machine */
+unsigned int drm_minors_limit = 16;	/* Enough for one machine */
 unsigned int drm_debug = 0;		/* 1 to enable debug output */
 EXPORT_SYMBOL(drm_debug);
 
 MODULE_AUTHOR(CORE_AUTHOR);
 MODULE_DESCRIPTION(CORE_DESC);
 MODULE_LICENSE("GPL and additional rights");
-MODULE_PARM_DESC(cards_limit, "Maximum number of graphics cards");
+MODULE_PARM_DESC(minors_limit, "Maximum number of graphics cards");
 MODULE_PARM_DESC(debug, "Enable debug output");
 
-module_param_named(cards_limit, drm_cards_limit, int, 0444);
+module_param_named(minors_limit, drm_minors_limit, int, 0444);
 module_param_named(debug, drm_debug, int, 0600);
 
-struct drm_head **drm_heads;
+struct drm_minor **drm_minors;
 struct class *drm_class;
 struct proc_dir_entry *drm_proc_root;
 
@@ -86,9 +86,9 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 	dev->irq = pdev->irq;
 	dev->irq_enabled = 0;
 
-	if (drm_ht_create(&dev->map_hash, DRM_MAP_HASH_ORDER)) {
+	if (drm_ht_create(&dev->map_hash, DRM_MAP_HASH_ORDER))
 		return -ENOMEM;
-	}
+
 	if (drm_mm_init(&dev->offset_manager, DRM_FILE_PAGE_OFFSET_START,
 			DRM_FILE_PAGE_OFFSET_SIZE)) {
 		drm_ht_remove(&dev->map_hash);
@@ -135,7 +135,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 		if ((retcode = dev->driver->load(dev, ent->driver_data)))
 			goto error_out_unreg;
 
-
 	retcode = drm_ctxbitmap_init(dev);
 	if (retcode) {
 		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
@@ -161,48 +160,53 @@ error_out_unreg:
  * create the proc init entry via proc_init(). This routines assigns
  * minor numbers to secondary heads of multi-headed cards
  */
-static int drm_get_head(struct drm_device * dev, struct drm_head * head)
+static int drm_get_minor(struct drm_device *dev, struct drm_minor *minor, int type)
 {
-	struct drm_head **heads = drm_heads;
+	struct drm_minor **minors = drm_minors;
 	int ret;
-	int minor;
+	int index;
 
 	DRM_DEBUG("\n");
 
-	for (minor = 0; minor < drm_cards_limit; minor++, heads++) {
-		if (!*heads) {
+	for (index = 0; index < drm_minors_limit; index++, minors++) {
+		if (!*minors) {
 
-			*head = (struct drm_head) {
+			*minor = (struct drm_minor) {
+				.type = type,
 				.dev = dev,
-				.device = MKDEV(DRM_MAJOR, minor),
-				.minor = minor,
+				.device = MKDEV(DRM_MAJOR, index),
+				.minor = index,
 			};
-			if ((ret =
-			     drm_proc_init(dev, minor, drm_proc_root,
-					   &head->dev_root))) {
-				printk(KERN_ERR
-				       "DRM: Failed to initialize /proc/dri.\n");
-				goto err_g1;
-			}
 
-			ret = drm_sysfs_device_add(dev, head);
+			if (type == DRM_MINOR_RENDER) {
+				ret = drm_proc_init(dev, index, drm_proc_root,
+						    &minor->dev_root);
+				if (ret) {
+					DRM_ERROR("DRM: Failed to initialize /proc/dri.\n");
+					goto err_g1;
+				}
+			} else
+				minor->dev_root = NULL;
+
+			ret = drm_sysfs_device_add(minor);
 			if (ret) {
 				printk(KERN_ERR
 				       "DRM: Error sysfs_device_add.\n");
 				goto err_g2;
 			}
-			*heads = head;
+			*minors = minor;
 
-			DRM_DEBUG("new minor assigned %d\n", minor);
+			DRM_DEBUG("new minor assigned %d\n", index);
 			return 0;
 		}
 	}
 	DRM_ERROR("out of minors\n");
 	return -ENOMEM;
 err_g2:
-	drm_proc_cleanup(minor, drm_proc_root, head->dev_root);
+	if (minor->type == DRM_MINOR_RENDER)
+		drm_proc_cleanup(index, drm_proc_root, minor->dev_root);
 err_g1:
-	*head = (struct drm_head) {
+	*minor = (struct drm_minor) {
 		.dev = NULL};
 	return ret;
 }
@@ -246,22 +250,28 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 		printk(KERN_ERR "DRM: fill_in_dev failed\n");
 		goto err_g3;
 	}
-	if ((ret = drm_get_head(dev, &dev->primary)))
+
+	if ((ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL)))
 		goto err_g3;
 
+	if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_RENDER)))
+		goto err_g4;
+
 	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
 		 driver->name, driver->major, driver->minor, driver->patchlevel,
 		 driver->date, dev->primary.minor);
 
 	return 0;
 
- err_g3:
+err_g4:
+	drm_put_minor(&dev->control);
+err_g3:
 	if (!drm_fb_loaded)
 		pci_disable_device(pdev);
- err_g2:
+err_g2:
 	if (!drm_fb_loaded)
 		pci_release_regions(pdev);
- err_g1:
+err_g1:
 	if (!drm_fb_loaded)
 		pci_set_drvdata(pdev, NULL);
 
@@ -310,17 +320,19 @@ int drm_put_dev(struct drm_device * dev)
  * last minor released.
  *
  */
-int drm_put_head(struct drm_head * head)
+int drm_put_minor(struct drm_minor *minor)
 {
-	int minor = head->minor;
+	int index = minor->minor;
 
-	DRM_DEBUG("release secondary minor %d\n", minor);
+	DRM_DEBUG("release secondary minor %d\n", index);
 
-	drm_proc_cleanup(minor, drm_proc_root, head->dev_root);
-	drm_sysfs_device_remove(head->dev);
+	if (minor->type == DRM_MINOR_RENDER)
+		drm_proc_cleanup(index, drm_proc_root, minor->dev_root);
+	drm_sysfs_device_remove(minor);
 
-	*head = (struct drm_head) {.dev = NULL};
+	*minor = (struct drm_minor) {.type = DRM_MINOR_UNASSIGNED,
+				     .dev = NULL};
 
-	drm_heads[minor] = NULL;
+	drm_minors[index] = NULL;
 	return 0;
 }