diff options
| author | Robert Noland <rnoland@FreeBSD.org> | 2009-06-25 16:17:07 +0000 |
|---|---|---|
| committer | Robert Noland <rnoland@FreeBSD.org> | 2009-06-25 16:17:07 +0000 |
| commit | a2cc8f993b61e4ea25a6eb1789f0bf009400a22a (patch) | |
| tree | 3653ef767686919f314a1a035ecd4259ca209968 /sys/dev/drm/radeon_cp.c | |
| parent | 53c405786b1cdc318bb35b9cf1e2fe6e4bcdee57 (diff) | |
| download | src-a2cc8f993b61e4ea25a6eb1789f0bf009400a22a.tar.gz src-a2cc8f993b61e4ea25a6eb1789f0bf009400a22a.zip | |
Initialize max_vblank_count earlier.
Small cleanup of the error paths while I'm here.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=194969
Diffstat (limited to 'sys/dev/drm/radeon_cp.c')
| -rw-r--r-- | sys/dev/drm/radeon_cp.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c index 8f723cea06c2..3d8cf9dfeccb 100644 --- a/sys/dev/drm/radeon_cp.c +++ b/sys/dev/drm/radeon_cp.c @@ -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; } |