Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 1 | /** |
| 2 | * \file drm_stub.h |
| 3 | * Stub support |
| 4 | * |
| 5 | * \author Rickard E. (Rik) Faith <faith@valinux.com> |
| 6 | */ |
| 7 | |
| 8 | /* |
| 9 | * Created: Fri Jan 19 10:48:35 2001 by faith@acm.org |
| 10 | * |
| 11 | * Copyright 2001 VA Linux Systems, Inc., Sunnyvale, California. |
| 12 | * All Rights Reserved. |
| 13 | * |
| 14 | * Permission is hereby granted, free of charge, to any person obtaining a |
| 15 | * copy of this software and associated documentation files (the "Software"), |
| 16 | * to deal in the Software without restriction, including without limitation |
| 17 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 18 | * and/or sell copies of the Software, and to permit persons to whom the |
| 19 | * Software is furnished to do so, subject to the following conditions: |
| 20 | * |
| 21 | * The above copyright notice and this permission notice (including the next |
| 22 | * paragraph) shall be included in all copies or substantial portions of the |
| 23 | * Software. |
| 24 | * |
| 25 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 26 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 27 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 28 | * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR |
| 29 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
| 30 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 31 | * DEALINGS IN THE SOFTWARE. |
| 32 | */ |
| 33 | |
| 34 | #include <linux/module.h> |
| 35 | #include <linux/moduleparam.h> |
| 36 | #include "drmP.h" |
| 37 | #include "drm_core.h" |
| 38 | |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 39 | unsigned int drm_debug = 0; /* 1 to enable debug output */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 40 | EXPORT_SYMBOL(drm_debug); |
| 41 | |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 42 | MODULE_AUTHOR(CORE_AUTHOR); |
| 43 | MODULE_DESCRIPTION(CORE_DESC); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 44 | MODULE_LICENSE("GPL and additional rights"); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 45 | MODULE_PARM_DESC(debug, "Enable debug output"); |
| 46 | |
Dave Jones | c075814 | 2005-10-03 15:02:20 -0400 | [diff] [blame] | 47 | module_param_named(debug, drm_debug, int, 0600); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 48 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 49 | struct idr drm_minors_idr; |
| 50 | |
Greg Kroah-Hartman | 0650fd5 | 2006-01-20 14:08:59 -0800 | [diff] [blame] | 51 | struct class *drm_class; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 52 | struct proc_dir_entry *drm_proc_root; |
| 53 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 54 | static int drm_minor_get_id(struct drm_device *dev, int type) |
| 55 | { |
| 56 | int new_id; |
| 57 | int ret; |
| 58 | int base = 0, limit = 63; |
| 59 | |
| 60 | again: |
| 61 | if (idr_pre_get(&drm_minors_idr, GFP_KERNEL) == 0) { |
| 62 | DRM_ERROR("Out of memory expanding drawable idr\n"); |
| 63 | return -ENOMEM; |
| 64 | } |
| 65 | mutex_lock(&dev->struct_mutex); |
| 66 | ret = idr_get_new_above(&drm_minors_idr, NULL, |
| 67 | base, &new_id); |
| 68 | mutex_unlock(&dev->struct_mutex); |
| 69 | if (ret == -EAGAIN) { |
| 70 | goto again; |
| 71 | } else if (ret) { |
| 72 | return ret; |
| 73 | } |
| 74 | |
| 75 | if (new_id >= limit) { |
| 76 | idr_remove(&drm_minors_idr, new_id); |
| 77 | return -EINVAL; |
| 78 | } |
| 79 | return new_id; |
| 80 | } |
| 81 | |
Dave Airlie | 84b1fd1 | 2007-07-11 15:53:27 +1000 | [diff] [blame] | 82 | static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 83 | const struct pci_device_id *ent, |
| 84 | struct drm_driver *driver) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 85 | { |
| 86 | int retcode; |
| 87 | |
Dave Airlie | bd1b331 | 2007-05-26 05:01:51 +1000 | [diff] [blame] | 88 | INIT_LIST_HEAD(&dev->filelist); |
Dave Airlie | 7c158ac | 2007-07-11 12:05:36 +1000 | [diff] [blame] | 89 | INIT_LIST_HEAD(&dev->ctxlist); |
| 90 | INIT_LIST_HEAD(&dev->vmalist); |
| 91 | INIT_LIST_HEAD(&dev->maplist); |
| 92 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 93 | spin_lock_init(&dev->count_lock); |
=?utf-8?q?Michel_D=C3=A4nzer?= | bea5679 | 2006-10-24 23:04:19 +1000 | [diff] [blame] | 94 | spin_lock_init(&dev->drw_lock); |
Thomas Hellstrom | 040ac32 | 2007-03-23 13:28:33 +1100 | [diff] [blame] | 95 | spin_lock_init(&dev->lock.spinlock); |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 96 | init_timer(&dev->timer); |
Dave Airlie | 30e2fb1 | 2006-02-02 19:37:46 +1100 | [diff] [blame] | 97 | mutex_init(&dev->struct_mutex); |
| 98 | mutex_init(&dev->ctxlist_mutex); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 99 | |
Dave Airlie | 45ea5dcd | 2007-07-17 14:20:07 +1000 | [diff] [blame] | 100 | idr_init(&dev->drw_idr); |
| 101 | |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 102 | dev->pdev = pdev; |
Eric Anholt | 2f02cc3 | 2006-09-22 04:19:34 +1000 | [diff] [blame] | 103 | dev->pci_device = pdev->device; |
| 104 | dev->pci_vendor = pdev->vendor; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 105 | |
| 106 | #ifdef __alpha__ |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 107 | dev->hose = pdev->sysdata; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 108 | #endif |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 109 | |
Thomas Hellstrom | 8d153f7 | 2006-08-07 22:36:47 +1000 | [diff] [blame] | 110 | if (drm_ht_create(&dev->map_hash, 12)) { |
Thomas Hellstrom | 8d153f7 | 2006-08-07 22:36:47 +1000 | [diff] [blame] | 111 | return -ENOMEM; |
| 112 | } |
Dave Airlie | 836cf04 | 2005-07-10 19:27:04 +1000 | [diff] [blame] | 113 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 114 | /* the DRM has 6 basic counters */ |
| 115 | dev->counters = 6; |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 116 | dev->types[0] = _DRM_STAT_LOCK; |
| 117 | dev->types[1] = _DRM_STAT_OPENS; |
| 118 | dev->types[2] = _DRM_STAT_CLOSES; |
| 119 | dev->types[3] = _DRM_STAT_IOCTLS; |
| 120 | dev->types[4] = _DRM_STAT_LOCKS; |
| 121 | dev->types[5] = _DRM_STAT_UNLOCKS; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 122 | |
| 123 | dev->driver = driver; |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 124 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 125 | if (drm_core_has_AGP(dev)) { |
Dave Airlie | cda1738 | 2005-07-10 17:31:26 +1000 | [diff] [blame] | 126 | if (drm_device_is_agp(dev)) |
| 127 | dev->agp = drm_agp_init(dev); |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 128 | if (drm_core_check_feature(dev, DRIVER_REQUIRE_AGP) |
| 129 | && (dev->agp == NULL)) { |
| 130 | DRM_ERROR("Cannot initialize the agpgart module.\n"); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 131 | retcode = -EINVAL; |
| 132 | goto error_out_unreg; |
| 133 | } |
| 134 | if (drm_core_has_MTRR(dev)) { |
| 135 | if (dev->agp) |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 136 | dev->agp->agp_mtrr = |
| 137 | mtrr_add(dev->agp->agp_info.aper_base, |
| 138 | dev->agp->agp_info.aper_size * |
| 139 | 1024 * 1024, MTRR_TYPE_WRCOMB, 1); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 140 | } |
| 141 | } |
| 142 | |
Dave Airlie | 2716a02 | 2007-11-22 18:23:13 +1000 | [diff] [blame] | 143 | if (dev->driver->load) |
| 144 | if ((retcode = dev->driver->load(dev, ent->driver_data))) |
| 145 | goto error_out_unreg; |
| 146 | |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 147 | retcode = drm_ctxbitmap_init(dev); |
| 148 | if (retcode) { |
| 149 | DRM_ERROR("Cannot allocate memory for context bitmap.\n"); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 150 | goto error_out_unreg; |
| 151 | } |
| 152 | |
Eric Anholt | 673a394 | 2008-07-30 12:06:12 -0700 | [diff] [blame] | 153 | if (driver->driver_features & DRIVER_GEM) { |
| 154 | retcode = drm_gem_init(dev); |
| 155 | if (retcode) { |
| 156 | DRM_ERROR("Cannot initialize graphics execution " |
| 157 | "manager (GEM)\n"); |
| 158 | goto error_out_unreg; |
| 159 | } |
| 160 | } |
| 161 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 162 | return 0; |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 163 | |
| 164 | error_out_unreg: |
Dave Airlie | 22eae94 | 2005-11-10 22:16:34 +1100 | [diff] [blame] | 165 | drm_lastclose(dev); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 166 | return retcode; |
| 167 | } |
| 168 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 169 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 170 | /** |
| 171 | * Get a secondary minor number. |
| 172 | * |
| 173 | * \param dev device data structure |
| 174 | * \param sec-minor structure to hold the assigned minor |
| 175 | * \return negative number on failure. |
| 176 | * |
| 177 | * Search an empty entry and initialize it to the given parameters, and |
| 178 | * create the proc init entry via proc_init(). This routines assigns |
| 179 | * minor numbers to secondary heads of multi-headed cards |
| 180 | */ |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 181 | static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 182 | { |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 183 | struct drm_minor *new_minor; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 184 | int ret; |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 185 | int minor_id; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 186 | |
| 187 | DRM_DEBUG("\n"); |
| 188 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 189 | minor_id = drm_minor_get_id(dev, type); |
| 190 | if (minor_id < 0) |
| 191 | return minor_id; |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 192 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 193 | new_minor = kzalloc(sizeof(struct drm_minor), GFP_KERNEL); |
| 194 | if (!new_minor) { |
| 195 | ret = -ENOMEM; |
| 196 | goto err_idr; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 197 | } |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 198 | |
| 199 | new_minor->type = type; |
| 200 | new_minor->device = MKDEV(DRM_MAJOR, minor_id); |
| 201 | new_minor->dev = dev; |
| 202 | new_minor->index = minor_id; |
| 203 | |
| 204 | idr_replace(&drm_minors_idr, new_minor, minor_id); |
| 205 | |
| 206 | if (type == DRM_MINOR_LEGACY) { |
| 207 | ret = drm_proc_init(new_minor, minor_id, drm_proc_root); |
| 208 | if (ret) { |
| 209 | DRM_ERROR("DRM: Failed to initialize /proc/dri.\n"); |
| 210 | goto err_mem; |
| 211 | } |
| 212 | } else |
| 213 | new_minor->dev_root = NULL; |
| 214 | |
| 215 | ret = drm_sysfs_device_add(new_minor); |
| 216 | if (ret) { |
| 217 | printk(KERN_ERR |
| 218 | "DRM: Error sysfs_device_add.\n"); |
| 219 | goto err_g2; |
| 220 | } |
| 221 | *minor = new_minor; |
| 222 | |
| 223 | DRM_DEBUG("new minor assigned %d\n", minor_id); |
| 224 | return 0; |
| 225 | |
| 226 | |
| 227 | err_g2: |
| 228 | if (new_minor->type == DRM_MINOR_LEGACY) |
| 229 | drm_proc_cleanup(new_minor, drm_proc_root); |
| 230 | err_mem: |
| 231 | kfree(new_minor); |
| 232 | err_idr: |
| 233 | idr_remove(&drm_minors_idr, minor_id); |
| 234 | *minor = NULL; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 235 | return ret; |
| 236 | } |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 237 | |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 238 | /** |
| 239 | * Register. |
| 240 | * |
| 241 | * \param pdev - PCI device structure |
| 242 | * \param ent entry from the PCI ID table with device type flags |
| 243 | * \return zero on success or a negative number on failure. |
| 244 | * |
| 245 | * Attempt to gets inter module "drm" information. If we are first |
| 246 | * then register the character device and inter module information. |
| 247 | * Try and register, if we fail to register, backout previous work. |
| 248 | */ |
| 249 | int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 250 | struct drm_driver *driver) |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 251 | { |
Dave Airlie | 84b1fd1 | 2007-07-11 15:53:27 +1000 | [diff] [blame] | 252 | struct drm_device *dev; |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 253 | int ret; |
| 254 | |
| 255 | DRM_DEBUG("\n"); |
| 256 | |
| 257 | dev = drm_calloc(1, sizeof(*dev), DRM_MEM_STUB); |
| 258 | if (!dev) |
| 259 | return -ENOMEM; |
| 260 | |
Jeff Garzik | 2c3f0ed | 2006-12-09 10:50:22 +1100 | [diff] [blame] | 261 | ret = pci_enable_device(pdev); |
| 262 | if (ret) |
| 263 | goto err_g1; |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 264 | |
Dave Airlie | 19a8f59a | 2008-02-07 14:48:32 +1000 | [diff] [blame] | 265 | pci_set_master(pdev); |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 266 | if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) { |
| 267 | printk(KERN_ERR "DRM: Fill_in_dev failed.\n"); |
Jeff Garzik | 2c3f0ed | 2006-12-09 10:50:22 +1100 | [diff] [blame] | 268 | goto err_g2; |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 269 | } |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 270 | if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY))) |
Jeff Garzik | 2c3f0ed | 2006-12-09 10:50:22 +1100 | [diff] [blame] | 271 | goto err_g2; |
Dave Airlie | bc5f452 | 2007-11-05 12:50:58 +1000 | [diff] [blame] | 272 | |
Dave Airlie | 22eae94 | 2005-11-10 22:16:34 +1100 | [diff] [blame] | 273 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", |
| 274 | driver->name, driver->major, driver->minor, driver->patchlevel, |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 275 | driver->date, dev->primary->index); |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 276 | |
| 277 | return 0; |
| 278 | |
Jeff Garzik | 2c3f0ed | 2006-12-09 10:50:22 +1100 | [diff] [blame] | 279 | err_g2: |
| 280 | pci_disable_device(pdev); |
| 281 | err_g1: |
Dave Airlie | c94f702 | 2005-07-07 21:03:38 +1000 | [diff] [blame] | 282 | drm_free(dev, sizeof(*dev), DRM_MEM_STUB); |
| 283 | return ret; |
| 284 | } |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 285 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 286 | /** |
| 287 | * Put a device minor number. |
| 288 | * |
| 289 | * \param dev device data structure |
| 290 | * \return always zero |
| 291 | * |
| 292 | * Cleans up the proc resources. If it is the last minor then release the foreign |
| 293 | * "drm" data, otherwise unregisters the "drm" data, frees the dev list and |
| 294 | * unregisters the character device. |
| 295 | */ |
Dave Airlie | 84b1fd1 | 2007-07-11 15:53:27 +1000 | [diff] [blame] | 296 | int drm_put_dev(struct drm_device * dev) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 297 | { |
| 298 | DRM_DEBUG("release primary %s\n", dev->driver->pci_driver.name); |
| 299 | |
| 300 | if (dev->unique) { |
| 301 | drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER); |
| 302 | dev->unique = NULL; |
| 303 | dev->unique_len = 0; |
| 304 | } |
| 305 | if (dev->devname) { |
| 306 | drm_free(dev->devname, strlen(dev->devname) + 1, |
| 307 | DRM_MEM_DRIVER); |
| 308 | dev->devname = NULL; |
| 309 | } |
| 310 | drm_free(dev, sizeof(*dev), DRM_MEM_STUB); |
| 311 | return 0; |
| 312 | } |
| 313 | |
| 314 | /** |
| 315 | * Put a secondary minor number. |
| 316 | * |
| 317 | * \param sec_minor - structure to be released |
| 318 | * \return always zero |
| 319 | * |
| 320 | * Cleans up the proc resources. Not legal for this to be the |
| 321 | * last minor released. |
| 322 | * |
| 323 | */ |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 324 | int drm_put_minor(struct drm_minor **minor_p) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 325 | { |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 326 | struct drm_minor *minor = *minor_p; |
Eric Anholt | 673a394 | 2008-07-30 12:06:12 -0700 | [diff] [blame] | 327 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 328 | DRM_DEBUG("release secondary minor %d\n", minor->index); |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 329 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 330 | if (minor->type == DRM_MINOR_LEGACY) |
| 331 | drm_proc_cleanup(minor, drm_proc_root); |
| 332 | drm_sysfs_device_remove(minor); |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 333 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 334 | idr_remove(&drm_minors_idr, minor->index); |
Dave Airlie | b5e89ed | 2005-09-25 14:28:13 +1000 | [diff] [blame] | 335 | |
Dave Airlie | 2c14f28 | 2008-04-21 16:47:32 +1000 | [diff] [blame] | 336 | kfree(minor); |
| 337 | *minor_p = NULL; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 338 | return 0; |
| 339 | } |