From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 02/12] drm/sis: clean up reclaim_buffers Date: Sun, 24 Jun 2012 20:09:41 +0200 Message-ID: <20120624180941.GB5087@phenom.ffwll.local> References: <1339669507-6277-1-git-send-email-daniel.vetter@ffwll.ch> <1339669507-6277-3-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 60D059E765 for ; Sun, 24 Jun 2012 11:08:04 -0700 (PDT) Received: by wibhn14 with SMTP id hn14so1978143wib.0 for ; Sun, 24 Jun 2012 11:08:03 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1339669507-6277-3-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: DRI Development Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org 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 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@ffwll.ch Mobile: +41 (0)79 365 57 48