diff options
| author |   David Herrmann <dh.herrmann@gmail.com> | 2013-10-02 11:23:34 +0200 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2013-10-09 14:38:15 +1000 |
| commit | 1bb72532ac260a2d3982b40bdd4c936d779d0d16 (patch) | |
| tree | f0ec6e8d7d68fe8dff496f0226ac3837fb3aac3d /drivers/gpu/drm/drm_pci.c | |
| parent | drm: kill ->gem_init_object() and friends (diff) | |
| download | linux-dev-1bb72532ac260a2d3982b40bdd4c936d779d0d16.tar.xz linux-dev-1bb72532ac260a2d3982b40bdd4c936d779d0d16.zip | |
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, DRM_DEBUG("\n"); - dev = kzalloc(sizeof(*dev), GFP_KERNEL); + dev = drm_dev_alloc(driver, &pdev->dev); if (!dev) return -ENOMEM; @@ -331,8 +331,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, goto err_g1; dev->pdev = pdev; - dev->dev = &pdev->dev; - dev->pci_device = pdev->device; dev->pci_vendor = pdev->vendor; |