drm: add drm simple memory manager support for SiS and VIA drivers

This add support to the SiS and VIA drivers for the simple memory manager.
This fixes a lot of problems with the current simple code these drivers used,
including locking and SMP issues.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/char/drm/via_map.c b/drivers/char/drm/via_map.c
index c6a08e96285b..782011e0a58d 100644
--- a/drivers/char/drm/via_map.c
+++ b/drivers/char/drm/via_map.c
@@ -98,6 +98,7 @@ int via_map_init(DRM_IOCTL_ARGS)
 int via_driver_load(drm_device_t *dev, unsigned long chipset)
 {
         drm_via_private_t *dev_priv;
+        int ret = 0;
 
         dev_priv = drm_calloc(1, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
         if (dev_priv == NULL)
@@ -108,13 +109,19 @@ int via_driver_load(drm_device_t *dev, unsigned long chipset)
         if (chipset == VIA_PRO_GROUP_A)
                 dev_priv->pro_group_a = 1;
 
-        return 0;
+        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
+        if (ret) {
+                drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+        }
+        return ret;
 }
 
 int via_driver_unload(drm_device_t *dev)
 {
         drm_via_private_t *dev_priv = dev->dev_private;
 
+        drm_sman_takedown(&dev_priv->sman);
+
         drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
 
         return 0;