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

Initialize max_vblank_count earlier.

Browse Source 
Small cleanup of the error paths while I'm here.

MFC after:	3 days
This commit is contained in:
Robert Noland 2009-06-25 16:17:07 +00:00
parent 53c405786b
commit a2cc8f993b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/drm/radeon_cp.c
View File

@ -2064,16 +2064,22 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
drm_get_resource_len(dev, 2), _DRM_REGISTERS,
_DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
if (ret != 0)
return ret;
goto error;
ret = drm_vblank_init(dev, 2);
if (ret) {
radeon_driver_unload(dev);
return ret;
}
if (ret != 0)
goto error;
dev->max_vblank_count = 0x001fffff;
DRM_DEBUG("%s card detected\n",
((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
((dev_priv->flags & RADEON_IS_AGP) ? "AGP" :
(((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
return ret;
error:
radeon_driver_unload(dev);
return ret;
}

2
sys/dev/drm/radeon_irq.c
View File

@ -380,8 +380,6 @@ int radeon_driver_irq_postinstall(struct drm_device * dev)
atomic_set(&dev_priv->swi_emitted, 0);
DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
dev->max_vblank_count = 0x001fffff;
radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
return 0;