From be5bf1346e49d5c2e0080913fd55e6898a8744cf Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sun, 1 Apr 2007 16:48:38 +1000
Subject: copy over some files and reorg radeon to add ttm fencing not working
 yet

---
 linux-core/radeon_buffer.c | 117 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 linux-core/radeon_buffer.c

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
new file mode 100644
index 00000000..796191c1
--- /dev/null
+++ b/linux-core/radeon_buffer.c
@@ -0,0 +1,117 @@
+/**************************************************************************
+ * 
+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * 
+ **************************************************************************/
+/*
+ * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ */
+
+#include "drmP.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+
+drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
+{
+	return drm_agp_init_ttm(dev, NULL);
+}
+
+int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
+{
+	*class = 0;
+	if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE))
+		*type = 3;
+	else
+		*type = 1;
+	return 0;
+}
+
+int radeon_invalidate_caches(drm_device_t * dev, uint32_t flags)
+{
+	/*
+	 * FIXME: Only emit once per batchbuffer submission.
+	 */
+#if 0
+	uint32_t flush_cmd = MI_NO_WRITE_FLUSH;
+
+	if (flags & DRM_BO_FLAG_READ)
+		flush_cmd |= MI_READ_FLUSH;
+	if (flags & DRM_BO_FLAG_EXE)
+		flush_cmd |= MI_EXE_FLUSH;
+
+	return 0;
+//	return radeon_emit_mi_flush(dev, flush_cmd);
+#endif
+	return 0;
+}
+
+uint32_t radeon_evict_mask(drm_buffer_object_t *bo)
+{
+	switch (bo->mem.mem_type) {
+	case DRM_BO_MEM_LOCAL:
+	case DRM_BO_MEM_TT:
+		return DRM_BO_FLAG_MEM_LOCAL;
+	default:
+		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED;
+	}
+}
+
+int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
+			 drm_mem_type_manager_t * man)
+{
+	switch (type) {
+	case DRM_BO_MEM_LOCAL:
+		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+		    _DRM_FLAG_MEMTYPE_CACHED;
+		man->drm_bus_maptype = 0;
+		break;
+	case DRM_BO_MEM_TT:
+		if (!(drm_core_has_AGP(dev) && dev->agp)) {
+			DRM_ERROR("AGP is not enabled for memory type %u\n",
+				  (unsigned)type);
+			return -EINVAL;
+		}
+		man->io_offset = dev->agp->agp_info.aper_base;
+		man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
+		man->io_addr = NULL;
+		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+		    _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
+		man->drm_bus_maptype = _DRM_AGP;
+		break;
+	default:
+		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+int radeon_move(drm_buffer_object_t * bo,
+		int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
+{
+
+	return 0;
+}
+
-- 
cgit v1.2.3


From b1f0b2d960a8f488332652677073ab95ce72cd3f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sun, 1 Apr 2007 18:24:23 +1000
Subject: radeon: de-static irq function, fixup fence/buffer

---
 linux-core/radeon_buffer.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 796191c1..b525ddfa 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -51,20 +51,13 @@ int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * typ
 
 int radeon_invalidate_caches(drm_device_t * dev, uint32_t flags)
 {
-	/*
-	 * FIXME: Only emit once per batchbuffer submission.
-	 */
-#if 0
-	uint32_t flush_cmd = MI_NO_WRITE_FLUSH;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
 
-	if (flags & DRM_BO_FLAG_READ)
-		flush_cmd |= MI_READ_FLUSH;
-	if (flags & DRM_BO_FLAG_EXE)
-		flush_cmd |= MI_EXE_FLUSH;
-
-	return 0;
-//	return radeon_emit_mi_flush(dev, flush_cmd);
-#endif
+	BEGIN_RING(4);
+	RADEON_FLUSH_CACHE();
+	RADEON_FLUSH_ZCACHE();
+	ADVANCE_RING();
 	return 0;
 }
 
@@ -111,7 +104,11 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 int radeon_move(drm_buffer_object_t * bo,
 		int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
 {
+	drm_bo_mem_reg_t *old_mem = &bo->mem;
 
+	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	}
 	return 0;
 }
 
-- 
cgit v1.2.3


From e835820e2359952bd42a66137c6b7ab243a5a541 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 3 Apr 2007 19:04:48 +1000
Subject: add initial PCIE GART framework for TTM

---
 linux-core/radeon_buffer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index b525ddfa..d5a1456a 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -36,7 +36,12 @@
 
 drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
 {
-	return drm_agp_init_ttm(dev, NULL);
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	if(dev_priv->flags & RADEON_IS_AGP)
+		return drm_agp_init_ttm(dev, NULL);
+	else
+		return ati_pcigart_init_ttm(dev, NULL);
 }
 
 int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
-- 
cgit v1.2.3


From 29ac7b1fe364a4be1db7e22d2b400bef04fc240d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 3 Apr 2007 21:20:00 +1000
Subject: radeon: add setup for PCIE GART ttm

---
 linux-core/radeon_buffer.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index d5a1456a..dd387604 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -80,6 +80,8 @@ uint32_t radeon_evict_mask(drm_buffer_object_t *bo)
 int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 			 drm_mem_type_manager_t * man)
 {
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
 	switch (type) {
 	case DRM_BO_MEM_LOCAL:
 		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
@@ -87,17 +89,25 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 		man->drm_bus_maptype = 0;
 		break;
 	case DRM_BO_MEM_TT:
-		if (!(drm_core_has_AGP(dev) && dev->agp)) {
-			DRM_ERROR("AGP is not enabled for memory type %u\n",
-				  (unsigned)type);
-			return -EINVAL;
+		if (dev_priv->flags & RADEON_IS_AGP) {
+			if (!(drm_core_has_AGP(dev) && dev->agp)) {
+				DRM_ERROR("AGP is not enabled for memory type %u\n",
+					  (unsigned)type);
+				return -EINVAL;
+			}
+			man->io_offset = dev->agp->agp_info.aper_base;
+			man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
+			man->io_addr = NULL;
+			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
+			man->drm_bus_maptype = _DRM_AGP;
+		} else {
+			man->io_offset = 0;
+			man->io_size = dev_priv->gart_size;
+			man->io_addr = NULL;
+			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE;
+			man->drm_bus_maptype = _DRM_SCATTER_GATHER;
 		}
-		man->io_offset = dev->agp->agp_info.aper_base;
-		man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
-		man->io_addr = NULL;
-		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
-		    _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
-		man->drm_bus_maptype = _DRM_AGP;
 		break;
 	default:
 		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
-- 
cgit v1.2.3


From 77b9d9d16b1d1f1715722182d5893aa202f73074 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@nx6125b.(none)>
Date: Tue, 5 Jun 2007 10:35:41 +1000
Subject: cleanup pcigart ttm for new backend layout

---
 linux-core/radeon_buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index dd387604..a90dae83 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -39,9 +39,9 @@ drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
 	if(dev_priv->flags & RADEON_IS_AGP)
-		return drm_agp_init_ttm(dev, NULL);
+		return drm_agp_init_ttm(dev);
 	else
-		return ati_pcigart_init_ttm(dev, NULL);
+		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info);
 }
 
 int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
-- 
cgit v1.2.3


From 4294dcc050c5d2685f633e8a52deb925d806be85 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@nx6125b.(none)>
Date: Tue, 5 Jun 2007 12:26:06 +1000
Subject: complete PCIE backend for ttm

ttm test runs with it at least, needs to do more testing on it
---
 linux-core/radeon_buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index a90dae83..6f7a7603 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -33,7 +33,6 @@
 #include "radeon_drm.h"
 #include "radeon_drv.h"
 
-
 drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -41,7 +40,7 @@ drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
 	if(dev_priv->flags & RADEON_IS_AGP)
 		return drm_agp_init_ttm(dev);
 	else
-		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info);
+		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info, radeon_gart_flush);
 }
 
 int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
-- 
cgit v1.2.3


From 03ce98aa2814dfd473c70487861aece79007a571 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@nx6125b.(none)>
Date: Tue, 5 Jun 2007 18:23:24 +1000
Subject: set start to gart_vm_start at least

---
 linux-core/radeon_buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 6f7a7603..159e87ea 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -101,7 +101,7 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
 			man->drm_bus_maptype = _DRM_AGP;
 		} else {
-			man->io_offset = 0;
+			man->io_offset = dev_priv->gart_vm_start;
 			man->io_size = dev_priv->gart_size;
 			man->io_addr = NULL;
 			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE;
@@ -120,6 +120,7 @@ int radeon_move(drm_buffer_object_t * bo,
 {
 	drm_bo_mem_reg_t *old_mem = &bo->mem;
 
+	DRM_DEBUG("\n");
 	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
 		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 	}
-- 
cgit v1.2.3


From abf35cbdcf5743c73929ddbe67ed4cae69b32aeb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@nx6125b.(none)>
Date: Thu, 7 Jun 2007 15:36:04 +1000
Subject: radeon: PCIGART memory is Can't map aperture as well there is one

on the CPU.... with this my indirect buffers at least start to live..
(cherry picked from commit 699cd9fc6c3794856f7e602088c77d0dfc11a122)
---
 linux-core/radeon_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 159e87ea..67e6c585 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -104,7 +104,7 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 			man->io_offset = dev_priv->gart_vm_start;
 			man->io_size = dev_priv->gart_size;
 			man->io_addr = NULL;
-			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE;
+			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CMA;
 			man->drm_bus_maptype = _DRM_SCATTER_GATHER;
 		}
 		break;
-- 
cgit v1.2.3


From ead9cd64bd767a30235860e9cfca25d937784bee Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Jul 2007 14:26:03 +1000
Subject: radeon: add VRAM support for radeon ttm

This needs a lot of testing
---
 linux-core/radeon_buffer.c | 134 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 132 insertions(+), 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 67e6c585..611d0d6a 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
+ * Copyright 2007 Dave Airlie
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,7 +26,7 @@
  * 
  **************************************************************************/
 /*
- * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ * Authors: Dave Airlie <airlied@linux.ie>
  */
 
 #include "drmP.h"
@@ -87,6 +87,14 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 		    _DRM_FLAG_MEMTYPE_CACHED;
 		man->drm_bus_maptype = 0;
 		break;
+	case DRM_BO_MEM_VRAM:
+		man->flags =  _DRM_FLAG_MEMTYPE_MAPPABLE |
+			_DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_NEEDS_IOREMAP;
+		man->io_addr = NULL;
+		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
+		man->io_offset = drm_get_resource_start(dev, 0);
+		man->io_size = drm_get_resource_len(dev, 0);
+		break;
 	case DRM_BO_MEM_TT:
 		if (dev_priv->flags & RADEON_IS_AGP) {
 			if (!(drm_core_has_AGP(dev) && dev->agp)) {
@@ -115,6 +123,122 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 	return 0;
 }
 
+static void radeon_emit_copy_blit(drm_device_t * dev,
+				  uint32_t src_offset,
+				  uint32_t dst_offset,
+				  uint32_t pages, int direction)
+{
+	uint32_t cur_pages;
+	uint32_t stride = PAGE_SIZE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	uint32_t format, height;
+	RING_LOCALS;
+
+	if (!dev_priv)
+		return;
+
+	/* 32-bit copy format */
+	format = RADEON_COLOR_FORMAT_ARGB8888;
+
+	/* radeon limited to 16k stride */
+	stride &= 0x3fff;
+	while(pages > 0) {
+		cur_pages = pages;
+		if (cur_pages > 2048)
+			cur_pages = 2048;
+		pages -= cur_pages;
+
+		/* needs verification */
+		BEGIN_RING(7);		
+		OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 5));
+		OUT_RING(RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_BRUSH_NONE |
+			 (format << 8) |
+			 RADEON_GMC_SRC_DATATYPE_COLOR |
+			 RADEON_ROP3_S |
+			 RADEON_DP_SRC_SOURCE_MEMORY |
+			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
+		if (direction) {
+			OUT_RING((stride << 22) | (src_offset >> 10));
+			OUT_RING((stride << 22) | (dst_offset >> 10));
+		} else {
+			OUT_RING((stride << 22) | (dst_offset >> 10));
+			OUT_RING((stride << 22) | (src_offset >> 10));
+		}
+		OUT_RING(0);
+		OUT_RING(pages); /* x - y */
+		OUT_RING((stride << 16) | cur_pages);
+		ADVANCE_RING();
+	}
+
+	BEGIN_RING(2);
+	RADEON_WAIT_UNTIL_2D_IDLE();
+	ADVANCE_RING();
+
+	return;
+}
+
+static int radeon_move_blit(drm_buffer_object_t * bo,
+			    int evict, int no_wait, drm_bo_mem_reg_t *new_mem)
+{
+	drm_bo_mem_reg_t *old_mem = &bo->mem;
+	int dir = 0;
+
+	if ((old_mem->mem_type == new_mem->mem_type) &&
+	    (new_mem->mm_node->start <
+	     old_mem->mm_node->start + old_mem->mm_node->size)) {
+		dir = 1;
+	}
+
+	radeon_emit_copy_blit(bo->dev,
+			      old_mem->mm_node->start << PAGE_SHIFT,
+			      new_mem->mm_node->start << PAGE_SHIFT,
+			      new_mem->num_pages, dir);
+
+	
+	return drm_bo_move_accel_cleanup(bo, evict, no_wait, 0,
+					 DRM_FENCE_TYPE_EXE |
+					 DRM_RADEON_FENCE_TYPE_RW,
+					 DRM_RADEON_FENCE_FLAG_FLUSHED, new_mem);
+}
+
+static int radeon_move_flip(drm_buffer_object_t * bo,
+			    int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
+{
+	drm_device_t *dev = bo->dev;
+	drm_bo_mem_reg_t tmp_mem;
+	int ret;
+
+	tmp_mem = *new_mem;
+	tmp_mem.mm_node = NULL;
+	tmp_mem.mask = DRM_BO_FLAG_MEM_TT |
+	    DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING;
+
+	ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
+	if (ret)
+		return ret;
+
+	ret = drm_bind_ttm(bo->ttm, 1, tmp_mem.mm_node->start);
+	if (ret)
+		goto out_cleanup;
+
+	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem);
+	if (ret)
+		goto out_cleanup;
+
+	ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
+out_cleanup:
+	if (tmp_mem.mm_node) {
+		mutex_lock(&dev->struct_mutex);
+		if (tmp_mem.mm_node != bo->pinned_node)
+			drm_mm_put_block(tmp_mem.mm_node);
+		tmp_mem.mm_node = NULL;
+		mutex_unlock(&dev->struct_mutex);
+	}
+	return ret;
+}
+
 int radeon_move(drm_buffer_object_t * bo,
 		int evict, int no_wait, drm_bo_mem_reg_t * new_mem)
 {
@@ -123,6 +247,12 @@ int radeon_move(drm_buffer_object_t * bo,
 	DRM_DEBUG("\n");
 	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
 		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		if (radeon_move_flip(bo, evict, no_wait, new_mem))
+			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	} else {
+		if (radeon_move_blit(bo, evict, no_wait, new_mem))
+			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 	}
 	return 0;
 }
-- 
cgit v1.2.3


From 0be629a914129446b353881f7d92aae707137047 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Mon, 16 Jul 2007 14:45:47 +1000
Subject: drm/radeon/ttm: more VRAM fixes

---
 linux-core/radeon_buffer.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 611d0d6a..5b10c24a 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -71,6 +71,11 @@ uint32_t radeon_evict_mask(drm_buffer_object_t *bo)
 	case DRM_BO_MEM_LOCAL:
 	case DRM_BO_MEM_TT:
 		return DRM_BO_FLAG_MEM_LOCAL;
+	case DRM_BO_MEM_VRAM:
+		if (bo->mem.num_pages > 128)
+			return DRM_BO_MEM_TT;
+		else
+			return DRM_BO_MEM_LOCAL;
 	default:
 		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED;
 	}
@@ -88,8 +93,7 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 		man->drm_bus_maptype = 0;
 		break;
 	case DRM_BO_MEM_VRAM:
-		man->flags =  _DRM_FLAG_MEMTYPE_MAPPABLE |
-			_DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_NEEDS_IOREMAP;
+		man->flags =  _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP;
 		man->io_addr = NULL;
 		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
 		man->io_offset = drm_get_resource_start(dev, 0);
-- 
cgit v1.2.3


From 89d44a1023543a95b429bf72662b5e2308b0a550 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sun, 7 Oct 2007 08:16:38 +1000
Subject: radeon: make vram fixed type

---
 linux-core/radeon_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 5b10c24a..3afc17ee 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -93,7 +93,7 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
 		man->drm_bus_maptype = 0;
 		break;
 	case DRM_BO_MEM_VRAM:
-		man->flags =  _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP;
+		man->flags =  _DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP;
 		man->io_addr = NULL;
 		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
 		man->io_offset = drm_get_resource_start(dev, 0);
-- 
cgit v1.2.3


From 75c9e0d3462f04766d490fac5cc93569957a8365 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <glisse@freedesktop.org>
Date: Tue, 26 Feb 2008 23:30:45 +0100
Subject: radeon: remove TTM from an earlier merge

---
 linux-core/radeon_buffer.c | 263 ---------------------------------------------
 1 file changed, 263 deletions(-)
 delete mode 100644 linux-core/radeon_buffer.c

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
deleted file mode 100644
index 5dff1898..00000000
--- a/linux-core/radeon_buffer.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/**************************************************************************
- * 
- * Copyright 2007 Dave Airlie
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * 
- **************************************************************************/
-/*
- * Authors: Dave Airlie <airlied@linux.ie>
- */
-
-#include "drmP.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
-
-struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device * dev)
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-
-	if(dev_priv->flags & RADEON_IS_AGP)
-		return drm_agp_init_ttm(dev);
-	else
-		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info, radeon_gart_flush);
-}
-
-int radeon_fence_types(struct drm_buffer_object *bo, uint32_t * class, uint32_t * type)
-{
-	*class = 0;
-	if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE))
-		*type = 3;
-	else
-		*type = 1;
-	return 0;
-}
-
-int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags)
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	BEGIN_RING(4);
-	RADEON_FLUSH_CACHE();
-	RADEON_FLUSH_ZCACHE();
-	ADVANCE_RING();
-	return 0;
-}
-
-uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
-{
-	switch (bo->mem.mem_type) {
-	case DRM_BO_MEM_LOCAL:
-	case DRM_BO_MEM_TT:
-		return DRM_BO_FLAG_MEM_LOCAL;
-	case DRM_BO_MEM_VRAM:
-		if (bo->mem.num_pages > 128)
-			return DRM_BO_MEM_TT;
-		else
-			return DRM_BO_MEM_LOCAL;
-	default:
-		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED;
-	}
-}
-
-int radeon_init_mem_type(struct drm_device * dev, uint32_t type,
-			 struct drm_mem_type_manager * man)
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-
-	switch (type) {
-	case DRM_BO_MEM_LOCAL:
-		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
-		    _DRM_FLAG_MEMTYPE_CACHED;
-		man->drm_bus_maptype = 0;
-		break;
-	case DRM_BO_MEM_VRAM:
-		man->flags =  _DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP;
-		man->io_addr = NULL;
-		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
-		man->io_offset = drm_get_resource_start(dev, 0);
-		man->io_size = drm_get_resource_len(dev, 0);
-		break;
-	case DRM_BO_MEM_TT:
-		if (dev_priv->flags & RADEON_IS_AGP) {
-			if (!(drm_core_has_AGP(dev) && dev->agp)) {
-				DRM_ERROR("AGP is not enabled for memory type %u\n",
-					  (unsigned)type);
-				return -EINVAL;
-			}
-			man->io_offset = dev->agp->agp_info.aper_base;
-			man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
-			man->io_addr = NULL;
-			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
-				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
-			man->drm_bus_maptype = _DRM_AGP;
-		} else {
-			man->io_offset = dev_priv->gart_vm_start;
-			man->io_size = dev_priv->gart_size;
-			man->io_addr = NULL;
-			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CMA;
-			man->drm_bus_maptype = _DRM_SCATTER_GATHER;
-		}
-		break;
-	default:
-		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
-		return -EINVAL;
-	}
-	return 0;
-}
-
-static void radeon_emit_copy_blit(struct drm_device * dev,
-				  uint32_t src_offset,
-				  uint32_t dst_offset,
-				  uint32_t pages, int direction)
-{
-	uint32_t cur_pages;
-	uint32_t stride = PAGE_SIZE;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	uint32_t format, height;
-	RING_LOCALS;
-
-	if (!dev_priv)
-		return;
-
-	/* 32-bit copy format */
-	format = RADEON_COLOR_FORMAT_ARGB8888;
-
-	/* radeon limited to 16k stride */
-	stride &= 0x3fff;
-	while(pages > 0) {
-		cur_pages = pages;
-		if (cur_pages > 2048)
-			cur_pages = 2048;
-		pages -= cur_pages;
-
-		/* needs verification */
-		BEGIN_RING(7);		
-		OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 5));
-		OUT_RING(RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
-			 RADEON_GMC_DST_PITCH_OFFSET_CNTL |
-			 RADEON_GMC_BRUSH_NONE |
-			 (format << 8) |
-			 RADEON_GMC_SRC_DATATYPE_COLOR |
-			 RADEON_ROP3_S |
-			 RADEON_DP_SRC_SOURCE_MEMORY |
-			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
-		if (direction) {
-			OUT_RING((stride << 22) | (src_offset >> 10));
-			OUT_RING((stride << 22) | (dst_offset >> 10));
-		} else {
-			OUT_RING((stride << 22) | (dst_offset >> 10));
-			OUT_RING((stride << 22) | (src_offset >> 10));
-		}
-		OUT_RING(0);
-		OUT_RING(pages); /* x - y */
-		OUT_RING((stride << 16) | cur_pages);
-		ADVANCE_RING();
-	}
-
-	BEGIN_RING(2);
-	RADEON_WAIT_UNTIL_2D_IDLE();
-	ADVANCE_RING();
-
-	return;
-}
-
-static int radeon_move_blit(struct drm_buffer_object * bo,
-			    int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
-{
-	struct drm_bo_mem_reg *old_mem = &bo->mem;
-	int dir = 0;
-
-	if ((old_mem->mem_type == new_mem->mem_type) &&
-	    (new_mem->mm_node->start <
-	     old_mem->mm_node->start + old_mem->mm_node->size)) {
-		dir = 1;
-	}
-
-	radeon_emit_copy_blit(bo->dev,
-			      old_mem->mm_node->start << PAGE_SHIFT,
-			      new_mem->mm_node->start << PAGE_SHIFT,
-			      new_mem->num_pages, dir);
-
-	
-	return drm_bo_move_accel_cleanup(bo, evict, no_wait, 0,
-					 DRM_FENCE_TYPE_EXE |
-					 DRM_RADEON_FENCE_TYPE_RW,
-					 DRM_RADEON_FENCE_FLAG_FLUSHED, new_mem);
-}
-
-static int radeon_move_flip(struct drm_buffer_object * bo,
-			    int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
-{
-	struct drm_device *dev = bo->dev;
-	struct drm_bo_mem_reg tmp_mem;
-	int ret;
-
-	tmp_mem = *new_mem;
-	tmp_mem.mm_node = NULL;
-	tmp_mem.flags = DRM_BO_FLAG_MEM_TT |
-	    DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING;
-
-	ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
-	if (ret)
-		return ret;
-
-	ret = drm_ttm_bind(bo->ttm, &tmp_mem);
-	if (ret)
-		goto out_cleanup;
-
-	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem);
-	if (ret)
-		goto out_cleanup;
-
-	ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
-out_cleanup:
-	if (tmp_mem.mm_node) {
-		mutex_lock(&dev->struct_mutex);
-		if (tmp_mem.mm_node != bo->pinned_node)
-			drm_mm_put_block(tmp_mem.mm_node);
-		tmp_mem.mm_node = NULL;
-		mutex_unlock(&dev->struct_mutex);
-	}
-	return ret;
-}
-
-int radeon_move(struct drm_buffer_object * bo,
-		int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
-{
-	struct drm_bo_mem_reg *old_mem = &bo->mem;
-
-	DRM_DEBUG("\n");
-	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
-		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
-		if (radeon_move_flip(bo, evict, no_wait, new_mem))
-			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-	} else {
-		if (radeon_move_blit(bo, evict, no_wait, new_mem))
-			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-	}
-	return 0;
-}
-
-- 
cgit v1.2.3


From df9871064e8b564d9ae2e56d561b64434fd004af Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 26 Jul 2008 08:56:23 +1000
Subject: radeon: add initial atombios modesetting and GEM -> TTM translation
 layer.

This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.

So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
---
 linux-core/radeon_buffer.c | 266 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 266 insertions(+)
 create mode 100644 linux-core/radeon_buffer.c

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
new file mode 100644
index 00000000..e9ba11d4
--- /dev/null
+++ b/linux-core/radeon_buffer.c
@@ -0,0 +1,266 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Dave Airlie
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * 
+ **************************************************************************/
+/*
+ * Authors: Dave Airlie <airlied@linux.ie>
+ */
+
+#include "drmP.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device * dev)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	if(dev_priv->flags & RADEON_IS_AGP)
+		return drm_agp_init_ttm(dev);
+	else
+		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info, radeon_gart_flush);
+}
+
+int radeon_fence_types(struct drm_buffer_object *bo, uint32_t * class, uint32_t * type)
+{
+	*class = 0;
+	*type = 1;
+	return 0;
+}
+
+int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	BEGIN_RING(4);
+	RADEON_FLUSH_CACHE();
+	RADEON_FLUSH_ZCACHE();
+	ADVANCE_RING();
+	return 0;
+}
+
+int radeon_init_mem_type(struct drm_device * dev, uint32_t type,
+			 struct drm_mem_type_manager * man)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	switch (type) {
+	case DRM_BO_MEM_LOCAL:
+		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+		    _DRM_FLAG_MEMTYPE_CACHED;
+		man->drm_bus_maptype = 0;
+		break;
+	case DRM_BO_MEM_VRAM:
+		man->flags =  _DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP;
+		man->io_addr = NULL;
+		man->drm_bus_maptype = _DRM_FRAME_BUFFER;
+		man->io_offset = drm_get_resource_start(dev, 0);
+		man->io_size = drm_get_resource_len(dev, 0);
+		break;
+	case DRM_BO_MEM_TT:
+		if (dev_priv->flags & RADEON_IS_AGP) {
+			if (!(drm_core_has_AGP(dev) && dev->agp)) {
+				DRM_ERROR("AGP is not enabled for memory type %u\n",
+					  (unsigned)type);
+				return -EINVAL;
+			}
+			man->io_offset = dev->agp->agp_info.aper_base;
+			man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
+			man->io_addr = NULL;
+			man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+				_DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
+			man->drm_bus_maptype = _DRM_AGP;
+		} else {
+			man->io_offset = dev_priv->gart_vm_start;
+			man->io_size = dev_priv->gart_size;
+			man->io_addr = NULL;
+			man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CMA;
+			man->drm_bus_maptype = _DRM_SCATTER_GATHER;
+		}
+		break;
+	default:
+		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static void radeon_emit_copy_blit(struct drm_device * dev,
+				  uint32_t src_offset,
+				  uint32_t dst_offset,
+				  uint32_t pages, int direction)
+{
+	uint32_t cur_pages;
+	uint32_t stride = PAGE_SIZE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	uint32_t format, height;
+	RING_LOCALS;
+
+	if (!dev_priv)
+		return;
+
+	/* 32-bit copy format */
+	format = RADEON_COLOR_FORMAT_ARGB8888;
+
+	/* radeon limited to 16k stride */
+	stride &= 0x3fff;
+	while(pages > 0) {
+		cur_pages = pages;
+		if (cur_pages > 2048)
+			cur_pages = 2048;
+		pages -= cur_pages;
+
+		/* needs verification */
+		BEGIN_RING(7);		
+		OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 5));
+		OUT_RING(RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_BRUSH_NONE |
+			 (format << 8) |
+			 RADEON_GMC_SRC_DATATYPE_COLOR |
+			 RADEON_ROP3_S |
+			 RADEON_DP_SRC_SOURCE_MEMORY |
+			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
+		if (direction) {
+			OUT_RING((stride << 22) | (src_offset >> 10));
+			OUT_RING((stride << 22) | (dst_offset >> 10));
+		} else {
+			OUT_RING((stride << 22) | (dst_offset >> 10));
+			OUT_RING((stride << 22) | (src_offset >> 10));
+		}
+		OUT_RING(0);
+		OUT_RING(pages); /* x - y */
+		OUT_RING((stride << 16) | cur_pages);
+		ADVANCE_RING();
+	}
+
+	BEGIN_RING(2);
+	RADEON_WAIT_UNTIL_2D_IDLE();
+	ADVANCE_RING();
+
+	return;
+}
+
+static int radeon_move_blit(struct drm_buffer_object * bo,
+			    int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
+{
+	struct drm_bo_mem_reg *old_mem = &bo->mem;
+	int dir = 0;
+
+	if ((old_mem->mem_type == new_mem->mem_type) &&
+	    (new_mem->mm_node->start <
+	     old_mem->mm_node->start + old_mem->mm_node->size)) {
+		dir = 1;
+	}
+
+	radeon_emit_copy_blit(bo->dev,
+			      old_mem->mm_node->start << PAGE_SHIFT,
+			      new_mem->mm_node->start << PAGE_SHIFT,
+			      new_mem->num_pages, dir);
+
+	
+	return drm_bo_move_accel_cleanup(bo, evict, no_wait, 0,
+					 DRM_FENCE_TYPE_EXE, 0,
+					 new_mem);
+}
+
+static int radeon_move_flip(struct drm_buffer_object * bo,
+			    int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
+{
+	struct drm_device *dev = bo->dev;
+	struct drm_bo_mem_reg tmp_mem;
+	int ret;
+
+	tmp_mem = *new_mem;
+	tmp_mem.mm_node = NULL;
+	//	tmp_mem.mask = DRM_BO_FLAG_MEM_TT |
+	//	    DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING;
+
+	ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
+	if (ret)
+		return ret;
+
+	ret = drm_ttm_bind(bo->ttm, &tmp_mem);
+	if (ret)
+		goto out_cleanup;
+
+	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem);
+	if (ret)
+		goto out_cleanup;
+
+	ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
+out_cleanup:
+	if (tmp_mem.mm_node) {
+		mutex_lock(&dev->struct_mutex);
+		if (tmp_mem.mm_node != bo->pinned_node)
+			drm_memrange_put_block(tmp_mem.mm_node);
+		tmp_mem.mm_node = NULL;
+		mutex_unlock(&dev->struct_mutex);
+	}
+	return ret;
+}
+
+int radeon_move(struct drm_buffer_object * bo,
+		int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
+{
+	struct drm_bo_mem_reg *old_mem = &bo->mem;
+
+	return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+#if 0
+	DRM_DEBUG("\n");
+	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		if (radeon_move_flip(bo, evict, no_wait, new_mem))
+			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	} else {
+		if (radeon_move_blit(bo, evict, no_wait, new_mem))
+			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+	}
+	return 0;
+#endif
+}
+
+
+/*
+ * i915_evict_flags:
+ *
+ * @bo: the buffer object to be evicted
+ *
+ * Return the bo flags for a buffer which is not mapped to the hardware.
+ * These will be placed in proposed_flags so that when the move is
+ * finished, they'll end up in bo->mem.flags
+ */
+uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
+{
+	switch (bo->mem.mem_type) {
+	case DRM_BO_MEM_LOCAL:
+	case DRM_BO_MEM_TT:
+		return DRM_BO_FLAG_MEM_LOCAL;
+	default:
+		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED;
+	}
+}
-- 
cgit v1.2.3


From 29649ddedee6b07b922c99233b8afc7c3a1db66f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2008 14:56:08 +1000
Subject: radeon: don't use ring if cp not going

---
 linux-core/radeon_buffer.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index e9ba11d4..a4ac38c1 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -55,10 +55,14 @@ int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags)
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	RING_LOCALS;
 
+	if (!dev_priv->cp_running)
+		return 0;
+
 	BEGIN_RING(4);
 	RADEON_FLUSH_CACHE();
 	RADEON_FLUSH_ZCACHE();
 	ADVANCE_RING();
+	COMMIT_RING();
 	return 0;
 }
 
-- 
cgit v1.2.3


From 64359586730268fc83ccc0db0487e217a894335b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 6 Aug 2008 15:58:09 +1000
Subject: radeon: just evict to TT not cached

---
 linux-core/radeon_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index a4ac38c1..5fdd9c35 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -265,6 +265,6 @@ uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
 	case DRM_BO_MEM_TT:
 		return DRM_BO_FLAG_MEM_LOCAL;
 	default:
-		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED;
+		return DRM_BO_FLAG_MEM_TT;
 	}
 }
-- 
cgit v1.2.3


From 01b2e7368a1f6f14b6d7b6377c804d482bb050cb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 26 Aug 2008 17:44:47 +1000
Subject: radeon/ttm: add support for zeroing the contents of VRAM buffers

This uses a solid fill fastpath, falling back to the slow memset path.
---
 linux-core/radeon_buffer.c | 277 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 224 insertions(+), 53 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 900d450a..96a584f3 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -37,7 +37,7 @@ struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device * dev)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
-	if(dev_priv->flags & RADEON_IS_AGP)
+	if (dev_priv->flags & RADEON_IS_AGP)
 		return drm_agp_init_ttm(dev);
 	else
 		return ati_pcigart_init_ttm(dev, &dev_priv->gart_info, radeon_gart_flush);
@@ -58,9 +58,10 @@ int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags)
 	if (!dev_priv->cp_running)
 		return 0;
 
-	BEGIN_RING(4);
-	RADEON_FLUSH_CACHE();
-	RADEON_FLUSH_ZCACHE();
+	BEGIN_RING(6);
+	RADEON_PURGE_CACHE();
+	RADEON_PURGE_ZCACHE();
+	RADEON_WAIT_UNTIL_3D_IDLE();
 	ADVANCE_RING();
 	COMMIT_RING();
 	return 0;
@@ -112,15 +113,17 @@ int radeon_init_mem_type(struct drm_device * dev, uint32_t type,
 	return 0;
 }
 
-static void radeon_emit_copy_blit(struct drm_device * dev,
-				  uint32_t src_offset,
-				  uint32_t dst_offset,
-				  uint32_t pages, int direction)
+void radeon_emit_copy_blit(struct drm_device * dev,
+			   uint32_t src_offset,
+			   uint32_t dst_offset,
+			   uint32_t pages)
 {
 	uint32_t cur_pages;
-	uint32_t stride = PAGE_SIZE;
+	uint32_t stride_bytes = PAGE_SIZE;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	uint32_t format, height;
+	uint32_t format, pitch;
+	const uint32_t clip = (0x1fff) | (0x1fff << 16);
+	uint32_t stride_pixels;
 	RING_LOCALS;
 
 	if (!dev_priv)
@@ -130,67 +133,171 @@ static void radeon_emit_copy_blit(struct drm_device * dev,
 	format = RADEON_COLOR_FORMAT_ARGB8888;
 
 	/* radeon limited to 16k stride */
-	stride &= 0x3fff;
+	stride_bytes &= 0x3fff;
+	/* radeon pitch is /64 */
+	pitch = stride_bytes / 64;
+
+	stride_pixels = stride_bytes / 4;
+
 	while(pages > 0) {
 		cur_pages = pages;
-		if (cur_pages > 2048)
-			cur_pages = 2048;
+		if (cur_pages > 8191)
+			cur_pages = 8191;
 		pages -= cur_pages;
 
-		/* needs verification */
-		BEGIN_RING(7);		
-		OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 5));
+		/* pages are in Y direction - height
+ 		   page width in X direction - width */
+		BEGIN_RING(10);
+		OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 8));
 		OUT_RING(RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
 			 RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_SRC_CLIPPING | RADEON_GMC_DST_CLIPPING |
 			 RADEON_GMC_BRUSH_NONE |
 			 (format << 8) |
 			 RADEON_GMC_SRC_DATATYPE_COLOR |
 			 RADEON_ROP3_S |
 			 RADEON_DP_SRC_SOURCE_MEMORY |
 			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
-		if (direction) {
-			OUT_RING((stride << 22) | (src_offset >> 10));
-			OUT_RING((stride << 22) | (dst_offset >> 10));
-		} else {
-			OUT_RING((stride << 22) | (dst_offset >> 10));
-			OUT_RING((stride << 22) | (src_offset >> 10));
-		}
-		OUT_RING(0);
+		OUT_RING((pitch << 22) | (src_offset >> 10));
+		OUT_RING((pitch << 22) | (dst_offset >> 10));
+		OUT_RING(clip); // SRC _SC BOT_RITE
+		OUT_RING(0);   // SC_TOP_LEFT
+		OUT_RING(clip); // SC_BOT_RITE
+
+		OUT_RING(pages);
 		OUT_RING(pages); /* x - y */
-		OUT_RING((stride << 16) | cur_pages);
+		OUT_RING(cur_pages | (stride_pixels << 16));
 		ADVANCE_RING();
 	}
 
-	BEGIN_RING(2);
+	BEGIN_RING(4);
+	OUT_RING(CP_PACKET0(RADEON_RB2D_DSTCACHE_CTLSTAT, 0));
+	OUT_RING(RADEON_RB2D_DC_FLUSH_ALL);
 	RADEON_WAIT_UNTIL_2D_IDLE();
 	ADVANCE_RING();
 
+	COMMIT_RING();
 	return;
 }
 
-static int radeon_move_blit(struct drm_buffer_object * bo,
-			    int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
+int radeon_move_blit(struct drm_buffer_object * bo,
+			    int evict, int no_wait, struct drm_bo_mem_reg *new_mem,
+			    struct drm_bo_mem_reg *old_mem)
 {
-	struct drm_bo_mem_reg *old_mem = &bo->mem;
-	int dir = 0;
+	struct drm_device *dev = bo->dev;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	uint32_t old_start, new_start;
 
-	if ((old_mem->mem_type == new_mem->mem_type) &&
-	    (new_mem->mm_node->start <
-	     old_mem->mm_node->start + old_mem->mm_node->size)) {
-		dir = 1;
-	}
+	old_start = old_mem->mm_node->start << PAGE_SHIFT;
+	new_start = new_mem->mm_node->start << PAGE_SHIFT;
+
+	if (old_mem->mem_type == DRM_BO_MEM_VRAM)
+		old_start += dev_priv->fb_location;
+	if (old_mem->mem_type == DRM_BO_MEM_TT)
+		old_start += dev_priv->gart_vm_start;
+
+	if (new_mem->mem_type == DRM_BO_MEM_VRAM)
+		new_start += dev_priv->fb_location;
+	if (new_mem->mem_type == DRM_BO_MEM_TT)
+		new_start += dev_priv->gart_vm_start;
 
 	radeon_emit_copy_blit(bo->dev,
-			      old_mem->mm_node->start << PAGE_SHIFT,
-			      new_mem->mm_node->start << PAGE_SHIFT,
-			      new_mem->num_pages, dir);
+			      old_start,
+			      new_start,
+			      new_mem->num_pages);
+
+	/* invalidate the chip caches */
 
-	
 	return drm_bo_move_accel_cleanup(bo, evict, no_wait, 0,
 					 DRM_FENCE_TYPE_EXE, 0,
 					 new_mem);
 }
 
+void radeon_emit_solid_fill(struct drm_device * dev,
+			    uint32_t dst_offset,
+			    uint32_t pages, uint8_t value)
+{
+	uint32_t cur_pages;
+	uint32_t stride_bytes = PAGE_SIZE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	uint32_t format, pitch;
+	const uint32_t clip = (0x1fff) | (0x1fff << 16);
+	uint32_t stride_pixels;
+	RING_LOCALS;
+
+	if (!dev_priv)
+		return;
+
+	/* 32-bit copy format */
+	format = RADEON_COLOR_FORMAT_ARGB8888;
+
+	/* radeon limited to 16k stride */
+	stride_bytes &= 0x3fff;
+	/* radeon pitch is /64 */
+	pitch = stride_bytes / 64;
+
+	stride_pixels = stride_bytes / 4;
+
+	while(pages > 0) {
+		cur_pages = pages;
+		if (cur_pages > 8191)
+			cur_pages = 8191;
+		pages -= cur_pages;
+
+		/* pages are in Y direction - height
+ 		   page width in X direction - width */
+		BEGIN_RING(8);
+		OUT_RING(CP_PACKET3(RADEON_CNTL_PAINT_MULTI, 6));
+		OUT_RING(RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			 RADEON_GMC_DST_CLIPPING |
+			 RADEON_GMC_BRUSH_SOLID_COLOR |
+			 (format << 8) |
+			 RADEON_ROP3_S |
+			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
+		OUT_RING((pitch << 22) | (dst_offset >> 10)); // PITCH
+		OUT_RING(0);   // SC_TOP_LEFT // DST CLIPPING
+		OUT_RING(clip); // SC_BOT_RITE
+
+		OUT_RING(0); // COLOR
+
+		OUT_RING(pages); /* x - y */
+		OUT_RING(cur_pages | (stride_pixels << 16));
+		ADVANCE_RING();
+	}
+
+	BEGIN_RING(4);
+	OUT_RING(CP_PACKET0(RADEON_RB2D_DSTCACHE_CTLSTAT, 0));
+	OUT_RING(RADEON_RB2D_DC_FLUSH_ALL);
+	RADEON_WAIT_UNTIL_2D_IDLE();
+	ADVANCE_RING();
+
+	COMMIT_RING();
+	return;
+}
+
+int radeon_move_zero_fill(struct drm_buffer_object * bo,
+			  int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
+{
+	struct drm_device *dev = bo->dev;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	uint32_t new_start;
+
+	new_start = new_mem->mm_node->start << PAGE_SHIFT;
+
+	if (new_mem->mem_type == DRM_BO_MEM_VRAM)
+		new_start += dev_priv->fb_location;
+
+	radeon_emit_solid_fill(bo->dev,
+			       new_start,
+			       new_mem->num_pages, 0);
+
+	/* invalidate the chip caches */
+
+	return drm_bo_move_accel_cleanup(bo, 1, no_wait, 0,
+					 DRM_FENCE_TYPE_EXE, 0,
+					 new_mem);
+}
+
 static int radeon_move_flip(struct drm_buffer_object * bo,
 			    int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
 {
@@ -200,8 +307,7 @@ static int radeon_move_flip(struct drm_buffer_object * bo,
 
 	tmp_mem = *new_mem;
 	tmp_mem.mm_node = NULL;
-	//	tmp_mem.mask = DRM_BO_FLAG_MEM_TT |
-	//	    DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING;
+	tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT;
 
 	ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
 	if (ret)
@@ -211,7 +317,7 @@ static int radeon_move_flip(struct drm_buffer_object * bo,
 	if (ret)
 		goto out_cleanup;
 
-	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem);
+	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem, &bo->mem);
 	if (ret)
 		goto out_cleanup;
 
@@ -227,25 +333,90 @@ out_cleanup:
 	return ret;
 }
 
+static int radeon_move_vram(struct drm_buffer_object * bo, 
+                            int evict, int no_wait, struct drm_bo_mem_reg * new_mem) 
+{ 
+	struct drm_device *dev = bo->dev; 
+	struct drm_bo_mem_reg tmp_mem;
+	struct drm_bo_mem_reg *old_mem = &bo->mem;
+	int ret; 
+	bool was_local = false;
+ 
+	/* old - LOCAL memory node bo->mem
+	   tmp - TT type memory node
+	   new - VRAM memory node */
+
+	tmp_mem = *old_mem;
+	tmp_mem.mm_node = NULL; 
+
+	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT; 
+ 
+		ret = drm_bo_mem_space(bo, &tmp_mem, no_wait); 
+		if (ret) 
+			return ret; 
+ 	}
+
+	if (!bo->ttm) {
+		ret = drm_bo_add_ttm(bo);
+		if (ret)
+			goto out_cleanup;
+	}
+
+	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		ret = drm_bo_move_ttm(bo, evict, no_wait, &tmp_mem);
+		if (ret)
+			return ret;
+	}
+
+	ret = radeon_move_blit(bo, 1, no_wait, new_mem, &bo->mem);
+	if (ret) 
+		goto out_cleanup; 
+ 
+out_cleanup: 
+	if (tmp_mem.mm_node) { 
+		mutex_lock(&dev->struct_mutex); 
+		if (tmp_mem.mm_node != bo->pinned_node) 
+			drm_mm_put_block(tmp_mem.mm_node); 
+		tmp_mem.mm_node = NULL; 
+		mutex_unlock(&dev->struct_mutex); 
+	} 
+	return ret; 
+} 
+
 int radeon_move(struct drm_buffer_object * bo,
-		int evict, int no_wait, struct drm_bo_mem_reg * new_mem)
+		int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
 {
+	struct drm_device *dev = bo->dev;
 	struct drm_bo_mem_reg *old_mem = &bo->mem;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
 
-	return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-#if 0
-	DRM_DEBUG("\n");
-	if (old_mem->mem_type == DRM_BO_MEM_LOCAL) {
-		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
-	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+    	if (!dev_priv->cp_running)
+		goto fallback;
+	
+	if (bo->mem.flags & DRM_BO_FLAG_CLEAN) /* need to implement solid fill */
+	{
+		if (radeon_move_zero_fill(bo, evict, no_wait, new_mem))
+			return drm_bo_move_zero(bo, evict, no_wait, new_mem);
+		return 0; 
+	}
+
+	if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
+		if (radeon_move_vram(bo, evict, no_wait, new_mem))
+			goto fallback;
+	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL){ 
 		if (radeon_move_flip(bo, evict, no_wait, new_mem))
-			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+			goto fallback;
 	} else {
-		if (radeon_move_blit(bo, evict, no_wait, new_mem))
-			return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
+		if (radeon_move_flip(bo, evict, no_wait, new_mem))
+			goto fallback;
 	}
 	return 0;
-#endif
+fallback:
+	if (bo->mem.flags & DRM_BO_FLAG_CLEAN)
+		return drm_bo_move_zero(bo, evict, no_wait, new_mem);
+	else
+		return drm_bo_move_memcpy(bo, evict, no_wait, new_mem);
 }
 
 
-- 
cgit v1.2.3


From 13e24fa7c03a4da6ba85b42d97290b4360c5ba8c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 18 Sep 2008 10:19:53 +1000
Subject: [PATCH] radeon: disable blit moves

---
 linux-core/radeon_buffer.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 96a584f3..5b2ba42f 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -401,6 +401,9 @@ int radeon_move(struct drm_buffer_object * bo,
 		return 0; 
 	}
 
+	/* disable these blit moves for now that appear to be failing */
+	goto fallback;
+
 	if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
 		if (radeon_move_vram(bo, evict, no_wait, new_mem))
 			goto fallback;
-- 
cgit v1.2.3


From 3a497db7862dc091a8582d8ea3ebfd7fe0f16b58 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 18 Sep 2008 10:22:23 +1000
Subject: radeon: fixup buffer and cs bits

---
 linux-core/radeon_buffer.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 5b2ba42f..fe2aa6fd 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -407,9 +407,6 @@ int radeon_move(struct drm_buffer_object * bo,
 	if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
 		if (radeon_move_vram(bo, evict, no_wait, new_mem))
 			goto fallback;
-	} else if (new_mem->mem_type == DRM_BO_MEM_LOCAL){ 
-		if (radeon_move_flip(bo, evict, no_wait, new_mem))
-			goto fallback;
 	} else {
 		if (radeon_move_flip(bo, evict, no_wait, new_mem))
 			goto fallback;
-- 
cgit v1.2.3


From fc33686ef044a4a59d48da2a648a0c2d0a1a7fd6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 16 Oct 2008 10:49:58 +1000
Subject: drm/radeon: initial suspend/resume fix.

This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
---
 linux-core/radeon_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index fe2aa6fd..c375100c 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -436,6 +436,6 @@ uint64_t radeon_evict_flags(struct drm_buffer_object *bo)
 	case DRM_BO_MEM_TT:
 		return DRM_BO_FLAG_MEM_LOCAL;
 	default:
-		return DRM_BO_FLAG_MEM_TT;
+		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL;
 	}
 }
-- 
cgit v1.2.3


From b18e6b0a0d9ef6902e4be1809ba710200f4c37be Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 16 Oct 2008 10:52:53 +1000
Subject: radeon: fix buffer copying for VRAM->TT

---
 linux-core/radeon_buffer.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index c375100c..9090000e 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -306,22 +306,32 @@ static int radeon_move_flip(struct drm_buffer_object * bo,
 	int ret;
 
 	tmp_mem = *new_mem;
-	tmp_mem.mm_node = NULL;
-	tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT;
 
-	ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
-	if (ret)
-		return ret;
+	/* if we are flipping into LOCAL memory we have no TTM so create one */
+	if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		tmp_mem.mm_node = NULL;
+		tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT;
 
-	ret = drm_ttm_bind(bo->ttm, &tmp_mem);
-	if (ret)
-		goto out_cleanup;
+		ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
+		if (ret)
+			return ret;
+
+		ret = drm_ttm_bind(bo->ttm, &tmp_mem);
+		if (ret)
+			goto out_cleanup;
+	}
 
 	ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem, &bo->mem);
 	if (ret)
 		goto out_cleanup;
 
-	ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
+	if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
+		ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
+	} else {
+		tmp_mem.mm_node = NULL;
+		new_mem->mm_node = NULL;
+	}
+
 out_cleanup:
 	if (tmp_mem.mm_node) {
 		mutex_lock(&dev->struct_mutex);
-- 
cgit v1.2.3


From 9c5819fc60808b00949f6aee55424f17a8b4f419 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 16 Oct 2008 10:53:26 +1000
Subject: radeon: re-enable hw blits for copying from VRAM

---
 linux-core/radeon_buffer.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 9090000e..e5a90892 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -411,9 +411,6 @@ int radeon_move(struct drm_buffer_object * bo,
 		return 0; 
 	}
 
-	/* disable these blit moves for now that appear to be failing */
-	goto fallback;
-
 	if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
 		if (radeon_move_vram(bo, evict, no_wait, new_mem))
 			goto fallback;
-- 
cgit v1.2.3


From 0dbe3436ee6e3f2a4d6d252ef5e31b7bb7e36764 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Nov 2008 09:28:36 +1000
Subject: radeon: fix some warnings

---
 linux-core/radeon_buffer.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index e5a90892..e88378a4 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -350,7 +350,6 @@ static int radeon_move_vram(struct drm_buffer_object * bo,
 	struct drm_bo_mem_reg tmp_mem;
 	struct drm_bo_mem_reg *old_mem = &bo->mem;
 	int ret; 
-	bool was_local = false;
  
 	/* old - LOCAL memory node bo->mem
 	   tmp - TT type memory node
@@ -398,7 +397,6 @@ int radeon_move(struct drm_buffer_object * bo,
 		int evict, int no_wait, struct drm_bo_mem_reg *new_mem)
 {
 	struct drm_device *dev = bo->dev;
-	struct drm_bo_mem_reg *old_mem = &bo->mem;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 
     	if (!dev_priv->cp_running)
-- 
cgit v1.2.3


From 31b8a640db9b55638bf9967f0d78ec665fa8839f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Nov 2008 09:46:54 +1000
Subject: radeon: overhaul ring interactions

emit in 16-dword blocks, emit irqs at same time as everything else
---
 linux-core/radeon_buffer.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index e88378a4..571a0b9c 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -170,10 +170,12 @@ void radeon_emit_copy_blit(struct drm_device * dev,
 		ADVANCE_RING();
 	}
 
-	BEGIN_RING(4);
+	BEGIN_RING(6);
 	OUT_RING(CP_PACKET0(RADEON_RB2D_DSTCACHE_CTLSTAT, 0));
 	OUT_RING(RADEON_RB2D_DC_FLUSH_ALL);
 	RADEON_WAIT_UNTIL_2D_IDLE();
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
 	ADVANCE_RING();
 
 	COMMIT_RING();
@@ -265,10 +267,14 @@ void radeon_emit_solid_fill(struct drm_device * dev,
 		ADVANCE_RING();
 	}
 
-	BEGIN_RING(4);
+	BEGIN_RING(8);
 	OUT_RING(CP_PACKET0(RADEON_RB2D_DSTCACHE_CTLSTAT, 0));
 	OUT_RING(RADEON_RB2D_DC_FLUSH_ALL);
 	RADEON_WAIT_UNTIL_2D_IDLE();
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
 	ADVANCE_RING();
 
 	COMMIT_RING();
-- 
cgit v1.2.3


From b7108445c9ebb37d06fcc7821e984124fda928f3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Nov 2008 09:52:40 +1000
Subject: radeon: fix ROP values for the paint ROP

---
 linux-core/radeon_buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/radeon_buffer.c')

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index 571a0b9c..f047b1ac 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -254,7 +254,8 @@ void radeon_emit_solid_fill(struct drm_device * dev,
 			 RADEON_GMC_DST_CLIPPING |
 			 RADEON_GMC_BRUSH_SOLID_COLOR |
 			 (format << 8) |
-			 RADEON_ROP3_S |
+			 RADEON_ROP3_P |
+			 RADEON_CLR_CMP_SRC_SOURCE |
 			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
 		OUT_RING((pitch << 22) | (dst_offset >> 10)); // PITCH
 		OUT_RING(0);   // SC_TOP_LEFT // DST CLIPPING
-- 
cgit v1.2.3