Commit 6e877b57 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie

Revert "drm/i810: cleanup reclaim_buffers"

This reverts commit 87499ffd.

Where is that paper bag ... ah here.

I've failed to take an odd interaction between my other cleanups and
this reclaim_buffers patch into account and also failed to properly
test it. Looks like there are more dragons and hidden trapdoors in the
drm release path than actual lines of code.

Until I get a clue, let's just revert this.
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0a962657
...@@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev) ...@@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev)
} }
/* Must be called with the lock held */ /* Must be called with the lock held */
void i810_driver_reclaim_buffers(struct drm_device *dev, static void i810_reclaim_buffers(struct drm_device *dev,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_device_dma *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
...@@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv) ...@@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
if (dev_priv->page_flipping) if (dev_priv->page_flipping)
i810_do_cleanup_pageflip(dev); i810_do_cleanup_pageflip(dev);
} }
}
if (file_priv->master && file_priv->master->lock.hw_lock) { void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
drm_idlelock_take(&file_priv->master->lock); struct drm_file *file_priv)
i810_driver_reclaim_buffers(dev, file_priv); {
drm_idlelock_release(&file_priv->master->lock); i810_reclaim_buffers(dev, file_priv);
} else {
/* master disappeared, clean up stuff anyway and hope nothing
* goes wrong */
i810_driver_reclaim_buffers(dev, file_priv);
}
} }
int i810_driver_dma_quiescent(struct drm_device *dev) int i810_driver_dma_quiescent(struct drm_device *dev)
......
...@@ -63,6 +63,7 @@ static struct drm_driver driver = { ...@@ -63,6 +63,7 @@ static struct drm_driver driver = {
.lastclose = i810_driver_lastclose, .lastclose = i810_driver_lastclose,
.preclose = i810_driver_preclose, .preclose = i810_driver_preclose,
.device_is_agp = i810_driver_device_is_agp, .device_is_agp = i810_driver_device_is_agp,
.reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
.dma_quiescent = i810_driver_dma_quiescent, .dma_quiescent = i810_driver_dma_quiescent,
.ioctls = i810_ioctls, .ioctls = i810_ioctls,
.fops = &i810_driver_fops, .fops = &i810_driver_fops,
......
...@@ -116,12 +116,14 @@ typedef struct drm_i810_private { ...@@ -116,12 +116,14 @@ typedef struct drm_i810_private {
/* i810_dma.c */ /* i810_dma.c */
extern int i810_driver_dma_quiescent(struct drm_device *dev); extern int i810_driver_dma_quiescent(struct drm_device *dev);
void i810_driver_reclaim_buffers(struct drm_device *dev, extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int i810_driver_load(struct drm_device *, unsigned long flags); extern int i810_driver_load(struct drm_device *, unsigned long flags);
extern void i810_driver_lastclose(struct drm_device *dev); extern void i810_driver_lastclose(struct drm_device *dev);
extern void i810_driver_preclose(struct drm_device *dev, extern void i810_driver_preclose(struct drm_device *dev,
struct drm_file *file_priv); struct drm_file *file_priv);
extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv);
extern int i810_driver_device_is_agp(struct drm_device *dev); extern int i810_driver_device_is_agp(struct drm_device *dev);
extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg); extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment