diff options
author | Dave Airlie <airlied@redhat.com> | 2009-07-06 15:10:29 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-07-06 15:10:29 +1000 |
commit | e1200cb89218930d01330ba0114e013438655cce (patch) | |
tree | 44fe2f178da72bf0520d500259050206c058f252 /src/radeon_exa_funcs.c | |
parent | 11cf8a28eb46f48d101888552266921bee8b63fc (diff) |
Revert "KMS CS fixes."
This reverts commit 11cf8a28eb46f48d101888552266921bee8b63fc.
I'll bring this back in a few minutes, I've got a big change introducing
a new cs space accounting scheme which this messes up and I think
probably conflicts with what I've done.
I promise i'll go over this and pick the bits that are still useful :)
Diffstat (limited to 'src/radeon_exa_funcs.c')
-rw-r--r-- | src/radeon_exa_funcs.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index fb33b6fe..5b723609 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -213,17 +213,6 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2) TRACE; -#ifdef ACCEL_CP - if (info->cs && info->cs->cdw > 15 * 1024) { - struct radeon_cs_space_check bos[1]; - - radeon_cs_flush_indirect(pScrn); - radeon_add_pixmap(bos, 0, pPix, 0, RADEON_GEM_DOMAIN_VRAM); - radeon_cs_space_check(info->cs, bos, 1); - FUNC_NAME(Emit2DState)(pScrn, RADEON_2D_EXA_SOLID); - } -#endif - if (info->accel_state->vsync) FUNC_NAME(RADEONWaitForVLine)(pScrn, pPix, RADEONBiggerCrtcArea(pPix), y1, y2); @@ -353,21 +342,6 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst, TRACE; -#ifdef ACCEL_CP - if (info->cs && info->cs->cdw > 15 * 1024) { - struct radeon_cs_space_check bos[2]; - - radeon_cs_flush_indirect(pScrn); - bos[0].bo = info->state_2d.src_bo; - bos[0].read_domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM; - bos[0].write_domain = 0; - bos[0].new_accounted = 0; - radeon_add_pixmap(bos, 1, pDst, 0, RADEON_GEM_DOMAIN_VRAM); - radeon_cs_space_check(info->cs, bos, 2); - FUNC_NAME(Emit2DState)(pScrn, RADEON_2D_EXA_COPY); - } -#endif - if (info->accel_state->xdir < 0) { srcX += w - 1; dstX += w - 1; |