|
@@ -330,9 +330,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET))
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET))
|
|
pci_set_drvdata(pdev, dev);
|
|
pci_set_drvdata(pdev, dev);
|
|
|
|
|
|
- mutex_lock(&drm_global_mutex);
|
|
|
|
drm_pci_agp_init(dev);
|
|
drm_pci_agp_init(dev);
|
|
- mutex_unlock(&drm_global_mutex);
|
|
|
|
|
|
|
|
ret = drm_dev_register(dev, ent->driver_data);
|
|
ret = drm_dev_register(dev, ent->driver_data);
|
|
if (ret)
|
|
if (ret)
|
|
@@ -350,9 +348,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
err_agp:
|
|
err_agp:
|
|
- mutex_lock(&drm_global_mutex);
|
|
|
|
drm_pci_agp_destroy(dev);
|
|
drm_pci_agp_destroy(dev);
|
|
- mutex_unlock(&drm_global_mutex);
|
|
|
|
pci_disable_device(pdev);
|
|
pci_disable_device(pdev);
|
|
err_free:
|
|
err_free:
|
|
drm_dev_free(dev);
|
|
drm_dev_free(dev);
|