diff options
| author | Daniel Vetter | 2011-10-26 22:21:13 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2011-12-22 00:33:22 +0100 |
| commit | 977b4f6edd7a960dd80c1a614a7644068f866c5b (patch) | |
| tree | fd88f3a302ccfd38f521548db97b36135c96d602 /drivers/gpu/drm/via/via_map.c | |
| parent | drm/sman: kill user_hash_tab (diff) | |
| download | kernel-qcow2-linux-977b4f6edd7a960dd80c1a614a7644068f866c5b.tar.gz kernel-qcow2-linux-977b4f6edd7a960dd80c1a614a7644068f866c5b.tar.xz kernel-qcow2-linux-977b4f6edd7a960dd80c1a614a7644068f866c5b.zip | |
drm/via: use drm_mm instead of drm_sman
To make the transition in a piece-wise and bisectable way possible,
I've hijacked the ->owner_list from drm_sman. While transitioning, the
list_add was done by the driver, while the list_del was still done by
the dying sman code.
Now that we are in full control of ->owner_list, do the list_del
ourselves.
v2: Better explain the list_del trickery as suggested by Chris Wilson.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/via/via_map.c')
| -rw-r--r-- | drivers/gpu/drm/via/via_map.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index fa5afbcf7e28..a2ab34365151 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c @@ -105,15 +105,9 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->chipset = chipset; idr_init(&dev->object_name_idr); - ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); - if (ret) { - kfree(dev_priv); - return ret; - } ret = drm_vblank_init(dev, 1); if (ret) { - drm_sman_takedown(&dev_priv->sman); kfree(dev_priv); return ret; } @@ -125,7 +119,6 @@ int via_driver_unload(struct drm_device *dev) { drm_via_private_t *dev_priv = dev->dev_private; - drm_sman_takedown(&dev_priv->sman); idr_remove_all(&dev_priv->object_idr); idr_destroy(&dev_priv->object_idr); |