Author: rnoland
Date: Thu Jun 25 16:17:07 2009
New Revision: 194969
URL: http://svn.freebsd.org/changeset/base/194969
Log:
  Initialize max_vblank_count earlier.
  
  Small cleanup of the error paths while I'm here.
  
  MFC after:    3 days

Modified:
  head/sys/dev/drm/radeon_cp.c
  head/sys/dev/drm/radeon_irq.c

Modified: head/sys/dev/drm/radeon_cp.c
==============================================================================
--- head/sys/dev/drm/radeon_cp.c        Thu Jun 25 16:15:39 2009        
(r194968)
+++ head/sys/dev/drm/radeon_cp.c        Thu Jun 25 16:17:07 2009        
(r194969)
@@ -2064,16 +2064,22 @@ int radeon_driver_load(struct drm_device
                         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;
 }
 

Modified: head/sys/dev/drm/radeon_irq.c
==============================================================================
--- head/sys/dev/drm/radeon_irq.c       Thu Jun 25 16:15:39 2009        
(r194968)
+++ head/sys/dev/drm/radeon_irq.c       Thu Jun 25 16:17:07 2009        
(r194969)
@@ -380,8 +380,6 @@ int radeon_driver_irq_postinstall(struct
        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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to