Revert the update to xf86-video-ati 6.14.3. Requested by espie@

who experiemnts regressions with this driver.

1 files changed, 1 insertions, 27 deletions

diff --git a/driver/xf86-video-ati/src/radeon_legacy_memory.c b/driver/xf86-video-ati/src/radeon_legacy_memory.c
index 5d66c920d..861fd979c 100644
--- a/driver/xf86-video-ati/src/radeon_legacy_memory.c
+++ b/driver/xf86-video-ati/src/radeon_legacy_memory.c
@@ -15,30 +15,12 @@ uint32_t
 radeon_legacy_allocate_memory(ScrnInfoPtr pScrn,
 		       void **mem_struct,
 		       int size,
-		       int align,
-		       int domain)
+		       int align)
 {
     ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
     RADEONInfoPtr info = RADEONPTR(pScrn);
     uint32_t offset = 0;
 
-#ifdef XF86DRM_MODE
-    if (info->cs) {
-	struct radeon_bo *video_bo;
-
-	if (*mem_struct)
-		radeon_legacy_free_memory(pScrn, *mem_struct);
-
-	video_bo = radeon_bo_open(info->bufmgr, 0, size, align, domain, 0);
-
-	*mem_struct = video_bo;
-
-	if (!video_bo)
-	    return 0;
-
-	return (uint32_t)-1;
-    }
-#endif
 #ifdef USE_EXA
     if (info->useEXA) {
 	ExaOffscreenArea *area = *mem_struct;
@@ -112,14 +94,6 @@ radeon_legacy_free_memory(ScrnInfoPtr pScrn,
 		   void *mem_struct)
 {
     RADEONInfoPtr info = RADEONPTR(pScrn);
-
-#ifdef XF86DRM_MODE
-    if (info->cs) {
-        struct radeon_bo *bo = mem_struct;
-	radeon_bo_unref(bo);
-	return;
-    }
-#endif
 #ifdef USE_EXA
     ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];