提交 8a5a8008 编写于 作者: D Daniel Vetter 提交者: Dave Airlie

drm: remove global_mutex locking around agp_init

David Herrmann dutifully moved this locking along when moving the
agp_init call out of the generic drm_dev_register into the pci
specific load helpers.

But afaict there's no need and the reason for that locking has been
purely a historical accident - we need the lock around the driver dev
node registration to paper over the midlayer init races, and the agp
init simply ended up in there. The real fix for all this is of course
to delay the dev (and sysfs/debugfs) interface registration until
everything is fully set up.

Until then stop the cargo-cult locking from spreading and remove the
locking.

Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NDave Airlie <airlied@redhat.com>
上级 d5e41ad3
......@@ -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))
pci_set_drvdata(pdev, dev);
mutex_lock(&drm_global_mutex);
drm_pci_agp_init(dev);
mutex_unlock(&drm_global_mutex);
ret = drm_dev_register(dev, ent->driver_data);
if (ret)
......@@ -350,9 +348,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
return 0;
err_agp:
mutex_lock(&drm_global_mutex);
drm_pci_agp_destroy(dev);
mutex_unlock(&drm_global_mutex);
pci_disable_device(pdev);
err_free:
drm_dev_free(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册