diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2013-10-02 05:23:34 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 00:38:15 -0400 |
commit | 1bb72532ac260a2d3982b40bdd4c936d779d0d16 (patch) | |
tree | f0ec6e8d7d68fe8dff496f0226ac3837fb3aac3d /drivers/gpu/drm/drm_pci.c | |
parent | 16eb5f4379b2097438a224381be3b4d9e56ac979 (diff) |
drm: add drm_dev_alloc() helper
Instead of managing device allocation+initialization in each bus-driver,
we should do that in a central place. drm_fill_in_dev() already does most
of it, but also requires the global drm lock for partial AGP device
registration.
Split both apart so we have a clean device initialization/allocation
phase, and a registration phase.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
-rw-r--r-- | drivers/gpu/drm/drm_pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 1f96cee6eee8..d2758be37a93 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
@@ -322,7 +322,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
322 | 322 | ||
323 | DRM_DEBUG("\n"); | 323 | DRM_DEBUG("\n"); |
324 | 324 | ||
325 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 325 | dev = drm_dev_alloc(driver, &pdev->dev); |
326 | if (!dev) | 326 | if (!dev) |
327 | return -ENOMEM; | 327 | return -ENOMEM; |
328 | 328 | ||
@@ -331,8 +331,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
331 | goto err_g1; | 331 | goto err_g1; |
332 | 332 | ||
333 | dev->pdev = pdev; | 333 | dev->pdev = pdev; |
334 | dev->dev = &pdev->dev; | ||
335 | |||
336 | dev->pci_device = pdev->device; | 334 | dev->pci_device = pdev->device; |
337 | dev->pci_vendor = pdev->vendor; | 335 | dev->pci_vendor = pdev->vendor; |
338 | 336 | ||