drm: rename driver hooks more understandably

Rename the driver hooks in the DRM to something a little more understandable:
preinit         ->      load
postinit        ->      (removed)
presetup        ->      firstopen
postsetup       ->      (removed)
open_helper     ->      open
prerelease      ->      preclose
free_filp_priv  ->      postclose
pretakedown     ->      lastclose
postcleanup     ->      unload
release         ->      reclaim_buffers_locked
version         ->      (removed)

postinit and version were replaced with generic code in the Linux DRM (drivers
now set their version numbers and description in the driver structure, like on
BSD).  postsetup wasn't used at all.  Fixes the savage hooks for
initializing and tearing down mappings at the right times.  Testing involved at
least starting X, running glxgears, killing glxgears, exiting X, and repeating.

Tested on:      FreeBSD (g200, g400, r200, r128)
                Linux (r200, savage4)

From: Eric Anholt <anholt@freebsd.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 29 insertions, 15 deletions

diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
index 6d10515795cc..c3101702a1fe 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
@@ -533,16 +533,32 @@ static void savage_fake_dma_flush(drm_savage_private_t * dev_priv)
         dev_priv->first_dma_page = dev_priv->current_dma_page = 0;
 }
 
+int savage_driver_load(drm_device_t *dev, unsigned long chipset)
+{
+        drm_savage_private_t *dev_priv;
+
+        dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
+        if (dev_priv == NULL)
+                return DRM_ERR(ENOMEM);
+
+        memset(dev_priv, 0, sizeof(drm_savage_private_t));
+        dev->dev_private = (void *)dev_priv;
+
+        dev_priv->chipset = (enum savage_family)chipset;
+
+        return 0;
+}
+
+
 /*
  * Initalize mappings. On Savage4 and SavageIX the alignment
  * and size of the aperture is not suitable for automatic MTRR setup
- * in drm_addmap. Therefore we do it manually before the maps are
- * initialized. We also need to take care of deleting the MTRRs in
- * postcleanup.
+ * in drm_addmap. Therefore we add them manually before the maps are
+ * initialized, and tear them down on last close.
  */
-int savage_preinit(drm_device_t * dev, unsigned long chipset)
+int savage_driver_firstopen(drm_device_t *dev)
 {
-        drm_savage_private_t *dev_priv;
+        drm_savage_private_t *dev_priv = dev->dev_private;
         unsigned long mmio_base, fb_base, fb_size, aperture_base;
         /* fb_rsrc and aper_rsrc aren't really used currently, but still exist
          * in case we decide we need information on the BAR for BSD in the
@@ -551,14 +567,6 @@ int savage_preinit(drm_device_t * dev, unsigned long chipset)
         unsigned int fb_rsrc, aper_rsrc;
         int ret = 0;
 
-        dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
-        if (dev_priv == NULL)
-                return DRM_ERR(ENOMEM);
-
-        memset(dev_priv, 0, sizeof(drm_savage_private_t));
-        dev->dev_private = (void *)dev_priv;
-        dev_priv->chipset = (enum savage_family)chipset;
-
         dev_priv->mtrr[0].handle = -1;
         dev_priv->mtrr[1].handle = -1;
         dev_priv->mtrr[2].handle = -1;
@@ -595,7 +603,8 @@ int savage_preinit(drm_device_t * dev, unsigned long chipset)
                         DRM_ERROR("strange pci_resource_len %08lx\n",
                                   drm_get_resource_len(dev, 0));
                 }
-        } else if (chipset != S3_SUPERSAVAGE && chipset != S3_SAVAGE2000) {
+        } else if (dev_priv->chipset != S3_SUPERSAVAGE &&
+                   dev_priv->chipset != S3_SAVAGE2000) {
                 mmio_base = drm_get_resource_start(dev, 0);
                 fb_rsrc = 1;
                 fb_base = drm_get_resource_start(dev, 1);
@@ -648,7 +657,7 @@ int savage_preinit(drm_device_t * dev, unsigned long chipset)
 /*
  * Delete MTRRs and free device-private data.
  */
-int savage_postcleanup(drm_device_t * dev)
+void savage_driver_lastclose(drm_device_t *dev)
 {
         drm_savage_private_t *dev_priv = dev->dev_private;
         int i;
@@ -658,6 +667,11 @@ int savage_postcleanup(drm_device_t * dev)
                         mtrr_del(dev_priv->mtrr[i].handle,
                                  dev_priv->mtrr[i].base,
                                  dev_priv->mtrr[i].size);
+}
+
+int savage_driver_unload(drm_device_t *dev)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
 
         drm_free(dev_priv, sizeof(drm_savage_private_t), DRM_MEM_DRIVER);