diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 02:13:12 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 02:13:12 +0200 |
| commit | 328aa7a45af61bc0060c80847daa67fef7b9c0d0 (patch) | |
| tree | 881a740801a9615e806ef7bf3830253a47f487a3 /drivers/gpu/drm/via/via_map.c | |
| parent | 5864eaf2f7f0ec3366be0efe9e7a5fd0476e25cc (diff) | |
| download | kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.zip kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.gz kernel_samsung_smdk4412-328aa7a45af61bc0060c80847daa67fef7b9c0d0.tar.bz2 | |
merged more from 3.0.101 that is not related to the platform
Diffstat (limited to 'drivers/gpu/drm/via/via_map.c')
| -rw-r--r-- | drivers/gpu/drm/via/via_map.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index 1f18225..6cca9a7 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c @@ -104,12 +104,15 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->chipset = chipset; - idr_init(&dev->object_name_idr); - - pci_set_master(dev->pdev); + 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; } @@ -121,8 +124,7 @@ int via_driver_unload(struct drm_device *dev) { drm_via_private_t *dev_priv = dev->dev_private; - idr_remove_all(&dev_priv->object_idr); - idr_destroy(&dev_priv->object_idr); + drm_sman_takedown(&dev_priv->sman); kfree(dev_priv); |