diff options
Diffstat (limited to 'drivers/char/drm/drm_stub.c')
-rw-r--r-- | drivers/char/drm/drm_stub.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 9a842a36bb27..5fd6dc0870cf 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c | |||
@@ -60,27 +60,29 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, | |||
60 | int retcode; | 60 | int retcode; |
61 | 61 | ||
62 | spin_lock_init(&dev->count_lock); | 62 | spin_lock_init(&dev->count_lock); |
63 | spin_lock_init(&dev->drw_lock); | ||
64 | spin_lock_init(&dev->tasklet_lock); | ||
63 | init_timer(&dev->timer); | 65 | init_timer(&dev->timer); |
64 | mutex_init(&dev->struct_mutex); | 66 | mutex_init(&dev->struct_mutex); |
65 | mutex_init(&dev->ctxlist_mutex); | 67 | mutex_init(&dev->ctxlist_mutex); |
66 | 68 | ||
67 | dev->pdev = pdev; | 69 | dev->pdev = pdev; |
70 | dev->pci_device = pdev->device; | ||
71 | dev->pci_vendor = pdev->vendor; | ||
68 | 72 | ||
69 | #ifdef __alpha__ | 73 | #ifdef __alpha__ |
70 | dev->hose = pdev->sysdata; | 74 | dev->hose = pdev->sysdata; |
71 | dev->pci_domain = dev->hose->bus->number; | ||
72 | #else | ||
73 | dev->pci_domain = 0; | ||
74 | #endif | 75 | #endif |
75 | dev->pci_bus = pdev->bus->number; | ||
76 | dev->pci_slot = PCI_SLOT(pdev->devfn); | ||
77 | dev->pci_func = PCI_FUNC(pdev->devfn); | ||
78 | dev->irq = pdev->irq; | 76 | dev->irq = pdev->irq; |
79 | 77 | ||
80 | dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS); | 78 | dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS); |
81 | if (dev->maplist == NULL) | 79 | if (dev->maplist == NULL) |
82 | return -ENOMEM; | 80 | return -ENOMEM; |
83 | INIT_LIST_HEAD(&dev->maplist->head); | 81 | INIT_LIST_HEAD(&dev->maplist->head); |
82 | if (drm_ht_create(&dev->map_hash, 12)) { | ||
83 | drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS); | ||
84 | return -ENOMEM; | ||
85 | } | ||
84 | 86 | ||
85 | /* the DRM has 6 basic counters */ | 87 | /* the DRM has 6 basic counters */ |
86 | dev->counters = 6; | 88 | dev->counters = 6; |