On Sam, 2003-02-08 at 18:56, Michel Dänzer wrote:
> On Sam, 2003-02-08 at 18:45, Charl P. Botha wrote:
> > On Sat, Feb 08, 2003 at 06:24:28PM +0100, Felix Kühling wrote:
> > > Found it. DRIVER_RELEASE in radeon.h has to call radeon_reclaim_buffers
> > > as the drm_drv.h template seems to expect DRIVER_RELEASE to handle this.
> > > DRIVER_RELEASE in i810.h does this too. The (1 line) patch is attached.
> >
> > Thanks for fixing yet another one Felix!
>
> Indeed, keep up the good work! :)
>
> > Should this not be forwarded to [EMAIL PROTECTED] or [EMAIL PROTECTED]
> > as well?
>
> It should get picked up from the mesa-4-0-4-branch, where I'll commit it
> shortly, as well as to the trunk.
Hmm, moving this to mesa-4-0-4-branch is trickier than I thought. Here's
a quick'n'dirty merge, but maybe we want to move over more of Keith's
recent work in this area? Keith?
--
Earthling Michel Dänzer (MrCooper)/ Debian GNU/Linux (powerpc) developer
XFree86 and DRI project member / CS student, Free Software enthusiast
Index: radeon.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon.h,v
retrieving revision 1.8
diff -p -u -r1.8 radeon.h
--- radeon.h 28 Oct 2002 19:05:37 -0000 1.8
+++ radeon.h 8 Feb 2003 18:35:23 -0000
@@ -114,8 +114,6 @@
/* When a client dies:
* - Check for and clean up flipped page state
* - Free any alloced agp memory.
- *
- * DRM infrastructure takes care of reclaiming dma buffers.
*/
#define DRIVER_PRERELEASE() do { \
if ( dev->dev_private ) { \
@@ -125,6 +123,14 @@
} \
radeon_mem_release( dev_priv->agp_heap ); \
} \
+} while (0)
+
+/* Reclaim DMA buffers when a client dies
+ */
+#define __HAVE_RELEASE 1
+#define DRIVER_RELEASE() \
+do { \
+ DRM(reclaim_buffers)( dev, priv->pid ); \
} while (0)
/* On unloading the module:
