From 3024f23c6551e219b0236041a8205bf1bc60ed94 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 31 Jan 2007 14:50:57 +0100
Subject: memory manager: Make device driver aware of different memory types.

Memory types are either fixed (on-card or pre-bound AGP) or not fixed
(dynamically bound) to an aperture. They also carry information about:

1) Whether they can be mapped cached.
2) Whether they are at all mappable.
3) Whether they need an ioremap to be accessible from kernel space.

In this way VRAM memory and, for example, pre-bound AGP appear
identical to the memory manager.

This also makes support for unmappable VRAM simple to implement.
---
 shared-core/drm.h      | 17 +++++++++++++----
 shared-core/i915_drv.h |  6 +++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 9efb1dc4..38cca882 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -738,8 +738,12 @@ typedef struct drm_fence_arg {
 #define DRM_BO_FLAG_MEM_TT     0x02000000
 /* Vram memory */
 #define DRM_BO_FLAG_MEM_VRAM   0x04000000
-/* Unmappable Vram memory */
-#define DRM_BO_FLAG_MEM_VRAM_NM   0x08000000
+/* Up to the driver to define. */
+#define DRM_BO_FLAG_MEM_PRIV0  0x10000000
+#define DRM_BO_FLAG_MEM_PRIV1  0x20000000
+#define DRM_BO_FLAG_MEM_PRIV2  0x40000000
+#define DRM_BO_FLAG_MEM_PRIV3  0x80000000
+
 /* Memory flag mask */
 #define DRM_BO_MASK_MEM         0xFF000000
 
@@ -823,8 +827,13 @@ typedef struct drm_bo_arg{
 #define DRM_BO_MEM_LOCAL 0
 #define DRM_BO_MEM_TT 1
 #define DRM_BO_MEM_VRAM 2
-#define DRM_BO_MEM_VRAM_NM 3
-#define DRM_BO_MEM_TYPES 2 /* For now. */
+#define DRM_BO_MEM_PRIV0 4
+#define DRM_BO_MEM_PRIV1 5
+#define DRM_BO_MEM_PRIV2 6
+#define DRM_BO_MEM_PRIV3 7
+
+
+#define DRM_BO_MEM_TYPES 8 /* For now. */
 
 typedef union drm_mm_init_arg{
 	struct {
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index ef9f3638..be7dd76a 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -126,7 +126,9 @@ typedef struct drm_i915_private {
 	uint32_t flush_pending;
 	uint32_t saved_flush_status;
 #endif
-
+#ifdef I915_HAVE_BUFFER
+	void *agp_iomap;
+#endif
 	spinlock_t swaps_lock;
 	drm_i915_vbl_swap_t vbl_swaps;
 	unsigned int swaps_pending;
@@ -187,6 +189,8 @@ extern void i915_poke_flush(drm_device_t *dev);
 extern drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t *dev);
 extern int i915_fence_types(uint32_t buffer_flags, uint32_t *class, uint32_t *type);
 extern int i915_invalidate_caches(drm_device_t *dev, uint32_t buffer_flags);
+extern int i915_init_mem_type(drm_device_t *dev, uint32_t type, 
+			       drm_mem_type_manager_t *man);
 #endif
 
 #define I915_READ(reg)          DRM_READ32(dev_priv->mmio_map, (reg))
-- 
cgit v1.2.3


From 609e3b037526021d20c7cc18b7fed1152206dc68 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 6 Feb 2007 14:20:33 +0100
Subject: Implement a policy for selecting memory types.

---
 shared-core/i915_drv.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared-core')

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index be7dd76a..55c8cf57 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -191,6 +191,7 @@ extern int i915_fence_types(uint32_t buffer_flags, uint32_t *class, uint32_t *ty
 extern int i915_invalidate_caches(drm_device_t *dev, uint32_t buffer_flags);
 extern int i915_init_mem_type(drm_device_t *dev, uint32_t type, 
 			       drm_mem_type_manager_t *man);
+extern uint32_t i915_evict_flags(drm_device_t *dev, uint32_t type);
 #endif
 
 #define I915_READ(reg)          DRM_READ32(dev_priv->mmio_map, (reg))
-- 
cgit v1.2.3


From c1fbd8a56653b91af57a408bbcf20a760a2bd8c8 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 7 Feb 2007 17:25:13 +0100
Subject: Checkpoint commit. Flag handling and memory type selection cleanup.
 glxgears won't start.

---
 shared-core/drm.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 38cca882..71189559 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -713,7 +713,7 @@ typedef struct drm_fence_arg {
  */
 #define DRM_BO_FLAG_NO_EVICT    0x00000010
 /* Always keep a system memory shadow to a vram buffer */
-#define DRM_BO_FLAG_SHADOW_VRAM 0x00000020
+#define DRM_BO_FLAG_MAPPABLE 0x00000020
 /* The buffer is shareable with other processes */
 #define DRM_BO_FLAG_SHAREABLE   0x00000040
 /* The buffer is currently cached */
@@ -724,13 +724,16 @@ typedef struct drm_fence_arg {
  * part of buffer manager shutdown or swapout. Not supported yet.*/
 #define DRM_BO_FLAG_NO_MOVE     0x00000100
 
+
+/*
+ * Request flags.
+ */
+
 /* Make sure the buffer is in cached memory when mapped for reading */
-#define DRM_BO_FLAG_READ_CACHED 0x00080000
-/* When there is a choice between VRAM and TT, prefer VRAM. 
-   The default behaviour is to prefer TT. */
-#define DRM_BO_FLAG_PREFER_VRAM 0x00040000
+#define DRM_BO_FLAG_READ_CACHED    0x00080000
 /* Bind this buffer cached if the hardware supports it. */
-#define DRM_BO_FLAG_BIND_CACHED 0x0002000
+#define DRM_BO_FLAG_FORCE_CACHING  0x00002000
+#define DRM_BO_FLAG_FORCE_MAPPABLE 0x00004000
 
 /* System Memory */
 #define DRM_BO_FLAG_MEM_LOCAL  0x01000000
@@ -746,6 +749,7 @@ typedef struct drm_fence_arg {
 
 /* Memory flag mask */
 #define DRM_BO_MASK_MEM         0xFF000000
+#define DRM_BO_MASK_MEMTYPE     0xFF0000A0
 
 /* When creating a buffer, Avoid system storage even if allowed */
 #define DRM_BO_HINT_AVOID_LOCAL 0x00000001
-- 
cgit v1.2.3


From 53aee3122a1821b8ca24ed2bc5c1940cb0f2ff8e Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 9 Feb 2007 16:36:53 +0100
Subject: I915 accelerated blit copy functional. Fixed - to System memory
 copies are implemented by flipping in a cache-coherent TTM, blitting to it,
 and then flipping it out.

---
 shared-core/i915_drv.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'shared-core')

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 55c8cf57..ffc9d431 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -192,6 +192,9 @@ extern int i915_invalidate_caches(drm_device_t *dev, uint32_t buffer_flags);
 extern int i915_init_mem_type(drm_device_t *dev, uint32_t type, 
 			       drm_mem_type_manager_t *man);
 extern uint32_t i915_evict_flags(drm_device_t *dev, uint32_t type);
+extern int i915_move(drm_buffer_object_t *bo, int evict,
+	      	int no_wait, drm_bo_mem_reg_t *new_mem);
+
 #endif
 
 #define I915_READ(reg)          DRM_READ32(dev_priv->mmio_map, (reg))
@@ -329,6 +332,7 @@ extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller);
 
 #define GFX_OP_DRAWRECT_INFO_I965  ((0x7900<<16)|0x2)
 
+#define SRC_COPY_BLT_CMD                ((2<<29)|(0x43<<22)|4)
 #define XY_SRC_COPY_BLT_CMD		((2<<29)|(0x53<<22)|6)
 #define XY_SRC_COPY_BLT_WRITE_ALPHA	(1<<21)
 #define XY_SRC_COPY_BLT_WRITE_RGB	(1<<20)
-- 
cgit v1.2.3


From abc14ddfb5ad85bf2a5094597d829e6614e6c359 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon, 12 Feb 2007 21:40:42 +0100
Subject: Update flags and comments.

---
 shared-core/drm.h | 95 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 35 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 71189559..479a1a65 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -694,9 +694,10 @@ typedef struct drm_fence_arg {
 } drm_fence_arg_t;
 
 /* Buffer permissions, referring to how the GPU uses the buffers.
-   these translate to fence types used for the buffers. 
-   Typically a texture buffer is read, A destination buffer is write and
-   a command (batch-) buffer is exe. Can be or-ed together. */
+ * these translate to fence types used for the buffers.
+ * Typically a texture buffer is read, A destination buffer is write and
+ *  a command (batch-) buffer is exe. Can be or-ed together.
+ */
 
 #define DRM_BO_FLAG_READ        0x00000001
 #define DRM_BO_FLAG_WRITE       0x00000002
@@ -704,55 +705,82 @@ typedef struct drm_fence_arg {
 
 /*
  * Status flags. Can be read to determine the actual state of a buffer.
+ * Can also be set in the buffer mask before validation.
  */
 
-/* 
- * Cannot evict this buffer. Not even with force. This type of buffer should
- * only be available for root, and must be manually removed before buffer
- * manager shutdown or swapout.
+/*
+ * Mask: Never evict this buffer. Not even with force. This type of buffer is only
+ * available to root and must be manually removed before buffer manager shutdown
+ * or lock.
+ * Flags: Acknowledge
  */
 #define DRM_BO_FLAG_NO_EVICT    0x00000010
-/* Always keep a system memory shadow to a vram buffer */
+
+/*
+ * Mask: Require that the buffer is placed in mappable memory when validated.
+ *       If not set the buffer may or may not be in mappable memory when validated.
+ * Flags: If set, the buffer is in mappable memory.
+ */
 #define DRM_BO_FLAG_MAPPABLE 0x00000020
-/* The buffer is shareable with other processes */
+
+/* Mask: The buffer should be shareable with other processes.
+ * Flags: The buffer is shareable with other processes.
+ */
 #define DRM_BO_FLAG_SHAREABLE   0x00000040
-/* The buffer is currently cached */
-#define DRM_BO_FLAG_CACHED      0x00000080
-/* Make sure that every time this buffer is validated, it ends up on the same
- * location. The buffer will also not be evicted when claiming space for
- * other buffers. Basically a pinned buffer but it may be thrown out as
- * part of buffer manager shutdown or swapout. Not supported yet.*/
-#define DRM_BO_FLAG_NO_MOVE     0x00000100
 
+/* Mask: If set, place the buffer in cache-coherent memory if available.
+ *       If clear, never place the buffer in cache coherent memory if validated.
+ * Flags: The buffer is currently in cache-coherent memory.
+ */
+#define DRM_BO_FLAG_CACHED      0x00000080
 
-/*
- * Request flags.
+/* Mask: Make sure that every time this buffer is validated,
+ *       it ends up on the same location provided that the memory mask is the same.
+ *       The buffer will also not be evicted when claiming space for
+ *       other buffers. Basically a pinned buffer but it may be thrown out as
+ *       part of buffer manager shutdown or locking.
+ * Flags: Acknowledge.
  */
+#define DRM_BO_FLAG_NO_MOVE     0x00000100
 
-/* Make sure the buffer is in cached memory when mapped for reading */
+/* Mask: Make sure the buffer is in cached memory when mapped for reading.
+ * Flags: Acknowledge.
+ */
 #define DRM_BO_FLAG_READ_CACHED    0x00080000
-/* Bind this buffer cached if the hardware supports it. */
+
+/* Mask: Force DRM_BO_FLAG_CACHED flag strictly also if it is set.
+ * Flags: Acknowledge.
+ */
 #define DRM_BO_FLAG_FORCE_CACHING  0x00002000
+
+/*
+ * Mask: Force DRM_BO_FLAG_MAPPABLE flag strictly also if it is clear.
+ * Flags: Acknowledge.
+ */
 #define DRM_BO_FLAG_FORCE_MAPPABLE 0x00004000
 
-/* System Memory */
+/*
+ * Memory type flags that can be or'ed together in the mask, but only
+ * one appears in flags.
+ */
+
+/* System memory */
 #define DRM_BO_FLAG_MEM_LOCAL  0x01000000
 /* Translation table memory */
 #define DRM_BO_FLAG_MEM_TT     0x02000000
 /* Vram memory */
 #define DRM_BO_FLAG_MEM_VRAM   0x04000000
 /* Up to the driver to define. */
-#define DRM_BO_FLAG_MEM_PRIV0  0x10000000
-#define DRM_BO_FLAG_MEM_PRIV1  0x20000000
-#define DRM_BO_FLAG_MEM_PRIV2  0x40000000
-#define DRM_BO_FLAG_MEM_PRIV3  0x80000000
+#define DRM_BO_FLAG_MEM_PRIV0  0x08000000
+#define DRM_BO_FLAG_MEM_PRIV1  0x10000000
+#define DRM_BO_FLAG_MEM_PRIV2  0x20000000
+#define DRM_BO_FLAG_MEM_PRIV3  0x40000000
+#define DRM_BO_FLAG_MEM_PRIV4  0x80000000
 
 /* Memory flag mask */
 #define DRM_BO_MASK_MEM         0xFF000000
 #define DRM_BO_MASK_MEMTYPE     0xFF0000A0
 
-/* When creating a buffer, Avoid system storage even if allowed */
-#define DRM_BO_HINT_AVOID_LOCAL 0x00000001
 /* Don't block on validate and map */
 #define DRM_BO_HINT_DONT_BLOCK  0x00000002
 /* Don't place this buffer on the unfenced list.*/
@@ -761,9 +789,6 @@ typedef struct drm_fence_arg {
 #define DRM_BO_HINT_ALLOW_UNFENCED_MAP 0x00000010
 
 
-/* Driver specific flags. Could be for example rendering engine */  
-#define DRM_BO_MASK_DRIVER      0x00F00000
-
 typedef enum {
 	drm_bo_type_dc,
 	drm_bo_type_user,
@@ -831,11 +856,11 @@ typedef struct drm_bo_arg{
 #define DRM_BO_MEM_LOCAL 0
 #define DRM_BO_MEM_TT 1
 #define DRM_BO_MEM_VRAM 2
-#define DRM_BO_MEM_PRIV0 4
-#define DRM_BO_MEM_PRIV1 5
-#define DRM_BO_MEM_PRIV2 6
-#define DRM_BO_MEM_PRIV3 7
-
+#define DRM_BO_MEM_PRIV0 3
+#define DRM_BO_MEM_PRIV1 4
+#define DRM_BO_MEM_PRIV2 5
+#define DRM_BO_MEM_PRIV3 6
+#define DRM_BO_MEM_PRIV4 7
 
 #define DRM_BO_MEM_TYPES 8 /* For now. */
 
-- 
cgit v1.2.3


From e1460426b885ab656e3cda3fd3841d64260434c5 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun, 11 Feb 2007 20:33:57 +0100
Subject: Bugzilla Bug #9457

Add refcounting of user waiters to the DRM hardware lock, so that we can use the
DRM_LOCK_CONT flag more conservatively.

Also add a kernel waiter refcount that if nonzero transfers the lock for the kernel context,
when it is released. This is useful when waiting for idle and can be used
for very simple fence object driver implementations for the new memory manager.

It also resolves the AIGLX startup deadlock for the sis and the via drivers.
i810, i830 still require that the hardware lock is really taken so the deadlock remains
for those two. I'm not sure about ffb. Anyone familiar with that code?
---
 shared-core/via_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared-core')

diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 33b0a42d..1446af2c 100644
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -57,8 +57,9 @@ static struct drm_driver driver = {
 	.dma_quiescent = via_driver_dma_quiescent,
 	.dri_library_name = dri_library_name,
 	.reclaim_buffers = drm_core_reclaim_buffers,
+	.reclaim_buffers_locked = NULL,
 #ifdef VIA_HAVE_CORE_MM
-	.reclaim_buffers_locked = via_reclaim_buffers_locked,
+	.reclaim_buffers_idlelocked = via_reclaim_buffers_locked,
 	.lastclose = via_lastclose,
 #endif
 	.get_map_ofs = drm_core_get_map_ofs,
-- 
cgit v1.2.3


From 59af900e4f62370457117b0659e3f28f89949499 Mon Sep 17 00:00:00 2001
From: "B. Rathmann" <koala_br@users.sourceforge.net>
Date: Wed, 14 Feb 2007 00:07:31 +0100
Subject: nouveau: fix memory initialization with multiple cards.

---
 shared-core/nouveau_mem.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index cd53d25d..3b1f443c 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -35,7 +35,7 @@
 #include "drm_sarea.h"
 #include "nouveau_drv.h"
 
-static int meminit_ok=0;
+//static int meminit_ok=0;
 
 static struct mem_block *split_block(struct mem_block *p, uint64_t start, uint64_t size,
 		DRMFILE filp)
@@ -373,10 +373,9 @@ struct mem_block* nouveau_mem_alloc(struct drm_device *dev, int alignment, uint6
 	/*
 	 * Init memory if needed
 	 */
-	if (meminit_ok==0)
+	if (dev_priv->fb_phys == 0)
 	{
 		nouveau_mem_init(dev);
-		meminit_ok=1;
 	}
 
 	/* 
@@ -446,8 +445,10 @@ alloc_ok:
 
 void nouveau_mem_free(struct drm_device* dev, struct mem_block* block)
 {
+        drm_nouveau_private_t *dev_priv = dev->dev_private;
+
 	DRM_INFO("freeing 0x%llx\n", block->start);
-	if (meminit_ok==0)
+	if (dev_priv->fb_phys == 0)
 	{
 		DRM_ERROR("%s called without init\n", __FUNCTION__);
 		return;
-- 
cgit v1.2.3


From f524870184b29885c6207af21fcb45c47fbaa576 Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Wed, 14 Feb 2007 00:08:55 +0100
Subject: nouveau: fix the build on big endian (thanks CyberFoxx)

---
 shared-core/nouveau_fifo.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index 7f929c5c..fd5455bf 100644
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -187,7 +187,7 @@ int nouveau_fifo_init(drm_device_t *dev)
 				      NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
 				      NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4 |
 #ifdef __BIG_ENDIAN
-				      NV_PFIFO_CACH1_BIG_ENDIAN |
+				      NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif				      
 				      0x00000000);
 
@@ -293,7 +293,7 @@ static void nouveau_nv04_context_init(drm_device_t *dev,
                                 NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
                                 NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4     |
 #ifdef __BIG_ENDIAN
-                                NV_PFIFO_CACH1_BIG_ENDIAN |
+                                NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
 				0x00000000);
 }
@@ -326,7 +326,7 @@ static void nouveau_nv10_context_init(drm_device_t *dev,
                         NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
                         NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4     |
 #ifdef __BIG_ENDIAN
-                        NV_PFIFO_CACH1_BIG_ENDIAN |
+                        NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
 			0x00000000);
 }
@@ -357,7 +357,7 @@ static void nouveau_nv30_context_init(drm_device_t *dev,
                                 NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
                                 NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8 |
 #ifdef __BIG_ENDIAN
-                                NV_PFIFO_CACH1_BIG_ENDIAN |
+                                NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
                                 0x00000000);
         
@@ -421,7 +421,7 @@ static void nouveau_nv40_context_init(drm_device_t *dev,
 				 NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
 				 NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8 |
 #ifdef __BIG_ENDIAN
-				 NV_PFIFO_CACH1_BIG_ENDIAN |
+				 NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
 				 0x30000000 /* no idea.. */);
 	RAMFC_WR(DMA_SUBROUTINE, init->put_base);
@@ -493,7 +493,7 @@ nouveau_fifo_context_restore(drm_device_t *dev, int channel)
 					NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
 					NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4 |
 #ifdef __BIG_ENDIAN
-					NV_PFIFO_CACH1_BIG_ENDIAN |
+					NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
 					0x00000000);
 }
-- 
cgit v1.2.3


From 5c9a7b0f9499b94856916facd110059223d243dc Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 14 Feb 2007 13:31:35 +0100
Subject: Remove an intel-specific hack and replace it with a fence driver
 callback.

---
 shared-core/i915_drv.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index ffc9d431..675fd168 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -178,10 +178,12 @@ extern void i915_mem_release(drm_device_t * dev,
 
 
 extern void i915_fence_handler(drm_device_t *dev);
-extern int i915_fence_emit_sequence(drm_device_t *dev, uint32_t flags,
+extern int i915_fence_emit_sequence(drm_device_t *dev, uint32_t class,
+				    uint32_t flags,
 				    uint32_t *sequence, 
 				    uint32_t *native_type);
-extern void i915_poke_flush(drm_device_t *dev);
+extern void i915_poke_flush(drm_device_t *dev, uint32_t class);
+extern int i915_fence_has_irq(drm_device_t *dev, uint32_t class, uint32_t flags);
 #endif
 
 #ifdef I915_HAVE_BUFFER
-- 
cgit v1.2.3


From 7766378d97323de375687285f2e125008b79045d Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu, 15 Feb 2007 12:10:33 +0100
Subject: Initial support for fence object classes.

(Fence objects belonging to different command submission mechanisms).
---
 shared-core/i915_dma.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 9624fac4..98a3b7c8 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -443,7 +443,7 @@ static void i915_emit_breadcrumb(drm_device_t *dev)
 	OUT_RING(0);
 	ADVANCE_LP_RING();
 #ifdef I915_HAVE_FENCE
-	drm_fence_flush_old(dev, dev_priv->counter);
+	drm_fence_flush_old(dev, 0, dev_priv->counter);
 #endif
 }
 
@@ -590,7 +590,7 @@ static int i915_dispatch_flip(drm_device_t * dev)
 	OUT_RING(0);
 	ADVANCE_LP_RING();
 #ifdef I915_HAVE_FENCE
-	drm_fence_flush_old(dev, dev_priv->counter);
+	drm_fence_flush_old(dev, 0, dev_priv->counter);
 #endif
 	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 	return 0;
-- 
cgit v1.2.3


From e0f53e59be4b96ed6eb28bd2df9f6a9d789d1734 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 16 Feb 2007 20:22:24 +0100
Subject: Simple fence object sample driver for via, based on idling the GPU.
 Buffer object driver for via. Some changes to buffer object driver callbacks.
 Improve fence flushing.

---
 shared-core/i915_drv.h |  6 +++---
 shared-core/via_dma.c  | 14 --------------
 shared-core/via_drm.h  | 14 ++------------
 shared-core/via_drv.c  | 48 ++++++++++++++++++++++++++++++++++++++++++++++-
 shared-core/via_drv.h  | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 shared-core/via_map.c  | 17 ++++++++++++++++-
 6 files changed, 119 insertions(+), 31 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 34875db8..3cb1a573 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -196,11 +196,11 @@ extern int i915_fence_has_irq(drm_device_t *dev, uint32_t class, uint32_t flags)
 #ifdef I915_HAVE_BUFFER
 /* i915_buffer.c */
 extern drm_ttm_backend_t *i915_create_ttm_backend_entry(drm_device_t *dev);
-extern int i915_fence_types(uint32_t buffer_flags, uint32_t *class, uint32_t *type);
+extern int i915_fence_types(drm_buffer_object_t *bo, uint32_t *class, uint32_t *type);
 extern int i915_invalidate_caches(drm_device_t *dev, uint32_t buffer_flags);
-extern int i915_init_mem_type(drm_device_t *dev, uint32_t type, 
+extern int i915_init_mem_type(drm_device_t *dev, uint32_t type,
 			       drm_mem_type_manager_t *man);
-extern uint32_t i915_evict_flags(drm_device_t *dev, uint32_t type);
+extern uint32_t i915_evict_mask(drm_buffer_object_t *bo);
 extern int i915_move(drm_buffer_object_t *bo, int evict,
 	      	int no_wait, drm_bo_mem_reg_t *new_mem);
 
diff --git a/shared-core/via_dma.c b/shared-core/via_dma.c
index 09159634..8c5a5c64 100644
--- a/shared-core/via_dma.c
+++ b/shared-core/via_dma.c
@@ -40,20 +40,6 @@
 #include "via_drv.h"
 #include "via_3d_reg.h"
 
-#define CMDBUF_ALIGNMENT_SIZE   (0x100)
-#define CMDBUF_ALIGNMENT_MASK   (0x0ff)
-
-/* defines for VIA 3D registers */
-#define VIA_REG_STATUS	  0x400
-#define VIA_REG_TRANSET	 0x43C
-#define VIA_REG_TRANSPACE       0x440
-
-/* VIA_REG_STATUS(0x400): Engine Status */
-#define VIA_CMD_RGTR_BUSY       0x00000080	/* Command Regulator is busy */
-#define VIA_2D_ENG_BUSY	 0x00000001	/* 2D Engine is busy */
-#define VIA_3D_ENG_BUSY	 0x00000002	/* 3D Engine is busy */
-#define VIA_VR_QUEUE_BUSY       0x00020000	/* Virtual Queue is busy */
-
 #define SetReg2DAGP(nReg, nData) {				\
 	*((uint32_t *)(vb)) = ((nReg) >> 2) | HALCYON_HEADER1;	\
 	*((uint32_t *)(vb) + 1) = (nData);			\
diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h
index 88345bdf..635e4637 100644
--- a/shared-core/via_drm.h
+++ b/shared-core/via_drm.h
@@ -58,21 +58,11 @@
 				      (VIA_MAX_CACHELINE_SIZE - 1)) &	\
 				     ~(VIA_MAX_CACHELINE_SIZE - 1)) +	\
 				    VIA_MAX_CACHELINE_SIZE*(lockNo)))
-
-/* Each region is a minimum of 64k, and there are at most 64 of them.
- */
 #define VIA_NR_TEX_REGIONS 64
-#define VIA_LOG_MIN_TEX_REGION_SIZE 16
+
 #endif
 
-#define VIA_UPLOAD_TEX0IMAGE  0x1	/* handled clientside */
-#define VIA_UPLOAD_TEX1IMAGE  0x2	/* handled clientside */
-#define VIA_UPLOAD_CTX	0x4
-#define VIA_UPLOAD_BUFFERS    0x8
-#define VIA_UPLOAD_TEX0       0x10
-#define VIA_UPLOAD_TEX1       0x20
-#define VIA_UPLOAD_CLIPRECTS  0x40
-#define VIA_UPLOAD_ALL	0xff
+#define DRM_VIA_FENCE_TYPE_ACCEL 0x00000002
 
 /* VIA specific ioctls */
 #define DRM_VIA_ALLOCMEM	0x00
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 1446af2c..0a478fef 100644
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -38,6 +38,47 @@ static struct pci_device_id pciidlist[] = {
 	viadrv_PCI_IDS
 };
 
+
+#ifdef VIA_HAVE_FENCE
+static drm_fence_driver_t via_fence_driver = {
+	.num_classes = 1,
+	.wrap_diff = (1 << 30),
+	.flush_diff = (1 << 20),
+	.sequence_mask = 0xffffffffU,
+	.lazy_capable = 1,
+	.emit = via_fence_emit_sequence,
+	.poke_flush = via_poke_flush,
+	.has_irq = via_fence_has_irq,
+};
+#endif
+#ifdef VIA_HAVE_BUFFER
+
+/**
+ * If there's no thrashing. This is the preferred memory type order.
+ */
+static uint32_t via_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
+
+/**
+ * If we have thrashing, most memory will be evicted to TT anyway, so we might as well
+ * just move the new buffer into TT from the start.
+ */
+static uint32_t via_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
+
+
+static drm_bo_driver_t via_bo_driver = {
+	.mem_type_prio = via_mem_prios,
+	.mem_busy_prio = via_busy_prios,
+	.num_mem_type_prio = ARRAY_SIZE(via_mem_prios),
+	.num_mem_busy_prio = ARRAY_SIZE(via_busy_prios),
+	.create_ttm_backend_entry = via_create_ttm_backend_entry,
+	.fence_type = via_fence_types,
+	.invalidate_caches = via_invalidate_caches,
+	.init_mem_type = via_init_mem_type,
+	.evict_mask = via_evict_mask,
+	.move = NULL,
+};
+#endif
+
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
 	.driver_features =
@@ -80,7 +121,12 @@ static struct drm_driver driver = {
 		.probe = probe,
 		.remove = __devexit_p(drm_cleanup_pci),
 	},
-
+#ifdef VIA_HAVE_FENCE
+	.fence_driver = &via_fence_driver,
+#endif
+#ifdef VIA_HAVE_BUFFER
+	.bo_driver = &via_bo_driver,
+#endif
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = VIA_DRM_DRIVER_DATE,
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index 42d0c749..baafbbff 100644
--- a/shared-core/via_drv.h
+++ b/shared-core/via_drv.h
@@ -32,6 +32,27 @@
 
 #include "via_verifier.h"
 
+/*
+ * Registers go here.
+ */
+
+
+#define CMDBUF_ALIGNMENT_SIZE   (0x100)
+#define CMDBUF_ALIGNMENT_MASK   (0x0ff)
+
+/* defines for VIA 3D registers */
+#define VIA_REG_STATUS	        0x400
+#define VIA_REG_TRANSET	        0x43C
+#define VIA_REG_TRANSPACE       0x440
+
+/* VIA_REG_STATUS(0x400): Engine Status */
+#define VIA_CMD_RGTR_BUSY       0x00000080	/* Command Regulator is busy */
+#define VIA_2D_ENG_BUSY	        0x00000001	/* 2D Engine is busy */
+#define VIA_3D_ENG_BUSY	        0x00000002	/* 3D Engine is busy */
+#define VIA_VR_QUEUE_BUSY       0x00020000	/* Virtual Queue is busy */
+
+
+
 #if defined(__linux__)
 #include "via_dmablit.h"
 
@@ -41,6 +62,8 @@
  */
 #define VIA_HAVE_DMABLIT 1
 #define VIA_HAVE_CORE_MM 1
+#define VIA_HAVE_FENCE   1
+#define VIA_HAVE_BUFFER  1
 #endif
 
 #define VIA_PCI_BUF_SIZE 60000
@@ -103,6 +126,12 @@ typedef struct drm_via_private {
 	drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES];
 #endif
         uint32_t dma_diff;
+#ifdef VIA_HAVE_FENCE
+	spinlock_t fence_lock;
+	uint32_t emit_0_sequence;
+	int have_idlelock;
+	struct timer_list fence_timer;
+#endif
 } drm_via_private_t;
 
 enum via_family {
@@ -163,4 +192,26 @@ extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq);
 extern void via_init_dmablit(drm_device_t *dev);
 #endif
 
+#ifdef VIA_HAVE_FENCE
+extern void via_fence_timer(unsigned long data);
+extern void via_poke_flush(drm_device_t * dev, uint32_t class);
+extern int via_fence_emit_sequence(drm_device_t * dev, uint32_t class,
+				   uint32_t flags,
+				   uint32_t * sequence,
+				   uint32_t * native_type);
+extern int via_fence_has_irq(struct drm_device * dev, uint32_t class,
+			     uint32_t flags);
+#endif
+
+#ifdef VIA_HAVE_BUFFER
+extern drm_ttm_backend_t *via_create_ttm_backend_entry(drm_device_t *dev);
+extern int via_fence_types(drm_buffer_object_t *bo, uint32_t *class, uint32_t *type);
+extern int via_invalidate_caches(drm_device_t *dev, uint32_t buffer_flags);
+extern int via_init_mem_type(drm_device_t *dev, uint32_t type,
+			       drm_mem_type_manager_t *man);
+extern uint32_t via_evict_mask(drm_buffer_object_t *bo);
+extern int via_move(drm_buffer_object_t *bo, int evict,
+	      	int no_wait, drm_bo_mem_reg_t *new_mem);
+#endif
+
 #endif
diff --git a/shared-core/via_map.c b/shared-core/via_map.c
index a37f5fd2..83324cfa 100644
--- a/shared-core/via_map.c
+++ b/shared-core/via_map.c
@@ -28,6 +28,7 @@
 static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init)
 {
 	drm_via_private_t *dev_priv = dev->dev_private;
+	int ret = 0;
 
 	DRM_DEBUG("%s\n", __FUNCTION__);
 
@@ -64,8 +65,22 @@ static int via_do_init_map(drm_device_t * dev, drm_via_init_t * init)
 #ifdef VIA_HAVE_DMABLIT
 	via_init_dmablit( dev );
 #endif
+#ifdef VIA_HAVE_FENCE
+	dev_priv->emit_0_sequence = 0;
+	dev_priv->have_idlelock = 0;
+	spin_lock_init(&dev_priv->fence_lock);
+	init_timer(&dev_priv->fence_timer);
+	dev_priv->fence_timer.function = &via_fence_timer;
+	dev_priv->fence_timer.data = (unsigned long) dev;
+#endif /* VIA_HAVE_FENCE */
 	dev->dev_private = (void *)dev_priv;
-	return 0;
+#ifdef VIA_HAVE_BUFFER
+	ret = drm_bo_driver_init(dev);
+	if (ret)
+		DRM_ERROR("Could not initialize buffer object driver.\n");
+#endif
+	return ret;
+
 }
 
 int via_do_cleanup_map(drm_device_t * dev)
-- 
cgit v1.2.3


From 9d8ba2d0d479f53b996c0a0e366acfee52daab3b Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Sun, 25 Feb 2007 10:48:26 +1100
Subject: drm: remove unnecessary NULL checks, and fix some indents..

---
 shared-core/drm.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'shared-core')

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 6fccec39..447065c7 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -678,7 +678,7 @@ typedef struct drm_set_version {
 
 typedef struct drm_fence_arg {
 	unsigned handle;
-        int class;
+	int class;
 	unsigned type;
 	unsigned flags;
 	unsigned signaled;
@@ -807,7 +807,7 @@ typedef struct drm_bo_arg_request {
 	drm_bo_type_t type;
 	unsigned arg_handle;
 	drm_u64_t buffer_start;
-        unsigned page_alignment;
+	unsigned page_alignment;
 	unsigned expand_pad[4]; /*Future expansion */
 	enum {
 		drm_bo_create,
@@ -838,11 +838,11 @@ typedef struct drm_bo_arg_reply {
 	drm_u64_t size;
 	drm_u64_t offset;
 	drm_u64_t arg_handle;
-        unsigned mask;
-        drm_u64_t buffer_start;
-        unsigned fence_flags;
-        unsigned rep_flags;
-        unsigned page_alignment;
+	unsigned mask;
+	drm_u64_t buffer_start;
+	unsigned fence_flags;
+	unsigned rep_flags;
+	unsigned page_alignment;
 	unsigned expand_pad[4]; /*Future expansion */
 }drm_bo_arg_reply_t;
 	
-- 
cgit v1.2.3