d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the locking in drm_alloc_resource()

Browse Source 
MFC after:	2 weeks
This commit is contained in:
rnoland 2009-08-23 14:27:46 +00:00
parent 8b1803af93
commit b149016ae8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/drm/drm_bufs.c
View File

@ -45,27 +45,35 @@ __FBSDID("$FreeBSD$");
*/
static int drm_alloc_resource(struct drm_device *dev, int resource)
{
struct resource *res;
int rid;
DRM_SPINLOCK_ASSERT(&dev->dev_lock);
if (resource >= DRM_MAX_PCI_RESOURCE) {
DRM_ERROR("Resource %d too large\n", resource);
return 1;
}
DRM_UNLOCK();
if (dev->pcir[resource] != NULL) {
DRM_LOCK();
return 0;
}
dev->pcirid[resource] = PCIR_BAR(resource);
dev->pcir[resource] = bus_alloc_resource_any(dev->device,
SYS_RES_MEMORY, &dev->pcirid[resource], RF_SHAREABLE);
DRM_UNLOCK();
rid = PCIR_BAR(resource);
res = bus_alloc_resource_any(dev->device, SYS_RES_MEMORY, &rid,
RF_SHAREABLE);
DRM_LOCK();
if (dev->pcir[resource] == NULL) {
if (res == NULL) {
DRM_ERROR("Couldn't find resource 0x%x\n", resource);
return 1;
}
if (dev->pcir[resource] == NULL) {
dev->pcirid[resource] = rid;
dev->pcir[resource] = res;
}
return 0;
}