diff options
| author | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-08-20 19:17:53 +0000 |
| commit | 9b0755de9f1e9517732f96a37f0ef30b8db23811 (patch) | |
| tree | ee9b2a74c07c732ee357d4810494c3b6aecd6e71 /sys/dev/drm | |
| parent | ab0b6203abac22f7fa981c24cf452d3dab032727 (diff) | |
| download | FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.zip FreeBSD-src-9b0755de9f1e9517732f96a37f0ef30b8db23811.tar.gz | |
Temporarily revert the new-bus locking for 8.0 release. It will be
reintroduced after HEAD is reopened for commits by re@.
Approved by: re (kib), attilio
Diffstat (limited to 'sys/dev/drm')
| -rw-r--r-- | sys/dev/drm/drm_drv.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c index e12f8cd..561afd5 100644 --- a/sys/dev/drm/drm_drv.c +++ b/sys/dev/drm/drm_drv.c @@ -614,13 +614,11 @@ int drm_open(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p) if (!retcode) { atomic_inc(&dev->counts[_DRM_STAT_OPENS]); - newbus_xlock(); DRM_LOCK(); device_busy(dev->device); if (!dev->open_count++) retcode = drm_firstopen(dev); DRM_UNLOCK(); - newbus_xunlock(); } return retcode; @@ -634,11 +632,6 @@ void drm_close(void *data) DRM_DEBUG("open_count = %d\n", dev->open_count); - /* - * We require to lock newbus here for handling device_unbusy() and - * avoid a LOR with DRM_LOCK. - */ - newbus_xlock(); DRM_LOCK(); if (dev->driver->preclose != NULL) @@ -715,7 +708,6 @@ void drm_close(void *data) } DRM_UNLOCK(); - newbus_xunlock(); } /* drm_ioctl is called whenever a process performs an ioctl on /dev/drm. |
