diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-06 14:45:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-06 15:11:15 +1000 |
| commit | d78d50591851d14543f0935d051a59ef29751bbc (patch) | |
| tree | 973a85b4d6df847813a50e9dcb4f2fe94e689bc7 /src/radeon.h | |
| parent | e1200cb89218930d01330ba0114e013438655cce (diff) | |
radeon: port to new space checking in libdrm interface
This uses a new libdrm interface which shares code with mesa.
It also fixes the bo to flush when full instead of never flushing.
It survives gtkperf -a here which the driver didn't before now
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/radeon.h b/src/radeon.h index 82136c83..c0300348 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -1069,7 +1069,6 @@ extern void RADEONWaitForFifoFunction(ScrnInfoPtr pScrn, int entries); #ifdef XF86DRI extern drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn); extern void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard); -extern void radeon_cs_flush_indirect(ScrnInfoPtr pScrn); extern void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn); extern int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info); # ifdef USE_XAA @@ -1266,6 +1265,12 @@ extern void radeon_legacy_free_memory(ScrnInfoPtr pScrn, void *mem_struct); +#ifdef XF86DRM_MODE +extern void radeon_cs_flush_indirect(ScrnInfoPtr pScrn); +extern void radeon_ddx_cs_start(ScrnInfoPtr pScrn, + int num, const char *file, + const char *func, int line); +#endif struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix); void radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo); @@ -1355,7 +1360,7 @@ do { \ xf86DrvMsg(pScrn->scrnIndex, X_INFO, \ "BEGIN_RING(%d) in %s\n", (unsigned int)n, __FUNCTION__);\ } \ - if (info->cs) radeon_cs_begin(info->cs, n, __FILE__, __func__, __LINE__); else { \ + if (info->cs) { radeon_ddx_cs_start(pScrn, n, __FILE__, __func__, __LINE__); } else { \ if (++info->cp->dma_begin_count != 1) { \ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, \ "BEGIN_RING without end at %s:%d\n", \ |