On Thu, Jun 14, 2012 at 12:24:57PM +0200, Daniel Vetter wrote:
> Like for via.
>
> v2: Actually drop the idlelock again if taken.
>
> v3: Fixup.
>
> v4: Fixup the "has master" vs. "is master" confusion the refactor
> introduced.
>
> v5: Drop the idlelock in the early return path.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
After a few trials of hunting around in the ebay dungeons I've managed to
scrap together a sis system which actually works on mesa 7.11. Hence this
(and the previous sis reworks) are now tested both with and without sis_fb
(different codepaths and memory managers) on a 64bit SMP machine. Card is
a 305 AGP sis:
5:00.0 VGA compatible controller [0300]: Silicon Integrated Systems [SiS] 300/305 PCI/AGP VGA Display Adapter [1039:0300] (rev 90)
Cheers, Daniel
> ---
> drivers/gpu/drm/sis/sis_drv.c | 3 +--
> drivers/gpu/drm/sis/sis_mm.c | 13 +++++++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
> index c7263a4..614029d 100644
> --- a/drivers/gpu/drm/sis/sis_drv.c
> +++ b/drivers/gpu/drm/sis/sis_drv.c
> @@ -105,10 +105,9 @@ static struct drm_driver driver = {
> .load = sis_driver_load,
> .unload = sis_driver_unload,
> .open = sis_driver_open,
> + .preclose = sis_reclaim_buffers_locked,
> .postclose = sis_driver_postclose,
> .dma_quiescent = sis_idle,
> - .reclaim_buffers = NULL,
> - .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,
> .lastclose = sis_lastclose,
> .ioctls = sis_ioctls,
> .fops = &sis_driver_fops,
> diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
> index dd4a316..5acc396 100644
> --- a/drivers/gpu/drm/sis/sis_mm.c
> +++ b/drivers/gpu/drm/sis/sis_mm.c
> @@ -321,14 +321,20 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
> struct sis_file_private *file_priv = file->driver_priv;
> struct sis_memblock *entry, *next;
>
> + if (!(file->minor->master && file->master->lock.hw_lock))
> + return;
> +
> + drm_idlelock_take(&file->master->lock);
> +
> mutex_lock(&dev->struct_mutex);
> if (list_empty(&file_priv->obj_list)) {
> mutex_unlock(&dev->struct_mutex);
> + drm_idlelock_release(&file->master->lock);
> +
> return;
> }
>
> - if (dev->driver->dma_quiescent)
> - dev->driver->dma_quiescent(dev);
> + sis_idle(dev);
>
>
> list_for_each_entry_safe(entry, next, &file_priv->obj_list,
> @@ -343,6 +349,9 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
> kfree(entry);
> }
> mutex_unlock(&dev->struct_mutex);
> +
> + drm_idlelock_release(&file->master->lock);
> +
> return;
> }
>
> --
> 1.7.10
>
--
Daniel Vetter
Mail: daniel@xxxxxxxx
Mobile: +41 (0)79 365 57 48
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
