diff options
| -rw-r--r-- | src/radeon.h | 9 | ||||
| -rw-r--r-- | src/radeon_dri.c | 55 | ||||
| -rw-r--r-- | src/radeon_dri.h | 4 |
3 files changed, 0 insertions, 68 deletions
diff --git a/src/radeon.h b/src/radeon.h index 4e685ddb..56bc0769 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -543,13 +543,8 @@ typedef struct { } RADEONConfigPrivRec, *RADEONConfigPrivPtr; typedef struct { -#ifdef PER_CONTEXT_SAREA - drm_context_t ctx_id; - drm_handle_t sarea_handle; -#else /* Nothing here yet */ int dummy; -#endif } RADEONDRIContextRec, *RADEONDRIContextPtr; struct radeon_dri { @@ -646,10 +641,6 @@ struct radeon_dri { int irq; -#ifdef PER_CONTEXT_SAREA - int perctx_sarea_size; -#endif - #ifdef USE_XAA uint32_t frontPitchOffset; uint32_t backPitchOffset; diff --git a/src/radeon_dri.c b/src/radeon_dri.c index ee62e952..6d12435d 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -300,36 +300,6 @@ static Bool RADEONCreateContext(ScreenPtr pScreen, VisualPtr visual, drm_context_t hwContext, void *pVisualConfigPriv, DRIContextType contextStore) { -#ifdef PER_CONTEXT_SAREA - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONDRIContextPtr ctx_info; - - ctx_info = (RADEONDRIContextPtr)contextStore; - if (!ctx_info) return FALSE; - - if (drmAddMap(info->dri->drmFD, 0, - info->dri->perctx_sarea_size, - DRM_SHM, - DRM_REMOVABLE, - &ctx_info->sarea_handle) < 0) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "[dri] could not create private sarea for ctx id (%d)\n", - (int)hwContext); - return FALSE; - } - - if (drmAddContextPrivateMapping(info->dri->drmFD, hwContext, - ctx_info->sarea_handle) < 0) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "[dri] could not associate private sarea to ctx id (%d)\n", - (int)hwContext); - drmRmMap(info->dri->drmFD, ctx_info->sarea_handle); - return FALSE; - } - - ctx_info->ctx_id = hwContext; -#endif return TRUE; } @@ -337,20 +307,6 @@ static Bool RADEONCreateContext(ScreenPtr pScreen, VisualPtr visual, static void RADEONDestroyContext(ScreenPtr pScreen, drm_context_t hwContext, DRIContextType contextStore) { -#ifdef PER_CONTEXT_SAREA - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONDRIContextPtr ctx_info; - - ctx_info = (RADEONDRIContextPtr)contextStore; - if (!ctx_info) return; - - if (drmRmMap(info->dri->drmFD, ctx_info->sarea_handle) < 0) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "[dri] could not remove private sarea for ctx id (%d)\n", - (int)hwContext); - } -#endif } /* Called when the X server is woken up to allow the last client's @@ -1624,12 +1580,6 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) correctly with pageflip + mergedfb/color tiling */ pDRIInfo->wrap.AdjustFrame = NULL; -#ifdef PER_CONTEXT_SAREA - /* This is only here for testing per-context SAREAs. When used, the - magic number below would be properly defined in a header file. */ - info->perctx_sarea_size = 64 * 1024; -#endif - #ifdef NOT_DONE /* FIXME: Need to extend DRI protocol to pass this size back to * client for SAREA mapping that includes a device private record @@ -1846,11 +1796,6 @@ Bool RADEONDRIFinishScreenInit(ScreenPtr pScreen) pRADEONDRI->sarea_priv_offset = sizeof(XF86DRISAREARec); -#ifdef PER_CONTEXT_SAREA - /* Set per-context SAREA size */ - pRADEONDRI->perctx_sarea_size = info->dri->perctx_sarea_size; -#endif - info->directRenderingInited = TRUE; /* Wrap CloseScreen */ diff --git a/src/radeon_dri.h b/src/radeon_dri.h index 6e3ad62a..15beb522 100644 --- a/src/radeon_dri.h +++ b/src/radeon_dri.h @@ -86,10 +86,6 @@ typedef struct { int log2GARTTexGran; int gartTexOffset; unsigned int sarea_priv_offset; - -#ifdef PER_CONTEXT_SAREA - drmSize perctx_sarea_size; -#endif } RADEONDRIRec, *RADEONDRIPtr; #endif |