aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-09-01 01:24:39 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 02:23:46 -0400
commit185abeccabe5aed0ef79e8572c3916ea08034a45 (patch)
tree69d49eab78472dcc55bb7fe524a49edca6bc2860 /drivers/gpu
parente05d7eaeba57921abad0ef564b0875e225171de8 (diff)
drm/nouveau: remove nouveau_gpuobj_late_takedown
Reviewed-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h1
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_object.c7
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 0844f27651c0..dc90fd2861b7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -741,7 +741,6 @@ extern void nouveau_channel_free(struct nouveau_channel *);
741extern int nouveau_gpuobj_early_init(struct drm_device *); 741extern int nouveau_gpuobj_early_init(struct drm_device *);
742extern int nouveau_gpuobj_init(struct drm_device *); 742extern int nouveau_gpuobj_init(struct drm_device *);
743extern void nouveau_gpuobj_takedown(struct drm_device *); 743extern void nouveau_gpuobj_takedown(struct drm_device *);
744extern void nouveau_gpuobj_late_takedown(struct drm_device *);
745extern int nouveau_gpuobj_suspend(struct drm_device *dev); 744extern int nouveau_gpuobj_suspend(struct drm_device *dev);
746extern void nouveau_gpuobj_suspend_cleanup(struct drm_device *dev); 745extern void nouveau_gpuobj_suspend_cleanup(struct drm_device *dev);
747extern void nouveau_gpuobj_resume(struct drm_device *dev); 746extern void nouveau_gpuobj_resume(struct drm_device *dev);
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 37615a447a4a..896cf8634144 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -207,16 +207,11 @@ nouveau_gpuobj_takedown(struct drm_device *dev)
207 struct drm_nouveau_private *dev_priv = dev->dev_private; 207 struct drm_nouveau_private *dev_priv = dev->dev_private;
208 208
209 NV_DEBUG(dev, "\n"); 209 NV_DEBUG(dev, "\n");
210}
211
212void
213nouveau_gpuobj_late_takedown(struct drm_device *dev)
214{
215 struct drm_nouveau_private *dev_priv = dev->dev_private;
216 210
217 BUG_ON(!list_empty(&dev_priv->gpuobj_list)); 211 BUG_ON(!list_empty(&dev_priv->gpuobj_list));
218} 212}
219 213
214
220static void 215static void
221nouveau_gpuobj_del(struct kref *ref) 216nouveau_gpuobj_del(struct kref *ref)
222{ 217{