WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_ring.c

  * Authors: Dave Airlie
  *          Alex Deucher
  *          Jerome Glisse
  */
 #include
+#include
 #include "drmP.h"
 #include "radeon_drm.h"
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "atom.h"
+	}
 	/* 64 dwords should be enough for fence too */
 	r = radeon_ring_lock(rdev, 64);
 	if (r) {
-		DRM_ERROR("radeon: scheduling IB failled (%d).\n", r);
+		DRM_ERROR("radeon: scheduling IB failed (%d).\n", r);
 		return r;
+	}
 	radeon_ring_ib_execute(rdev, ib);
 	radeon_fence_emit(rdev, ib->fence);
 	if (rdev->ib_pool.robj)
 		return 0;
 	INIT_LIST_HEAD(&rdev->ib_pool.bogus_ib);
 	/* Allocate 1M object buffer */
-	r = radeon_bo_create(rdev, NULL,  RADEON_IB_POOL_SIZE*64*1024,
+	r = radeon_bo_create(rdev, RADEON_IB_POOL_SIZE*64*1024,
-				 true, RADEON_GEM_DOMAIN_GTT,
+			     PAGE_SIZE, true, RADEON_GEM_DOMAIN_GTT,
 				&rdev->ib_pool.robj);
 	if (r) {
 		DRM_ERROR("radeon: failed to ib pool (%d).\n", r);
 		return r;
 		return r;
+	}
 	r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr);
 	radeon_bo_unreserve(rdev->ib_pool.robj);
 	if (r) {
-		DRM_ERROR("radeon: failed to map ib poll (%d).\n", r);
+		DRM_ERROR("radeon: failed to map ib pool (%d).\n", r);
 		return r;
+	}
 	for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
 		unsigned offset;
+}
 void radeon_ib_pool_fini(struct radeon_device *rdev)
+{
+	int r;
-	int r;
+	struct radeon_bo *robj;
 	if (!rdev->ib_pool.ready) {
 		return;
+	}
-	}
+	mutex_lock(&rdev->ib_pool.mutex);
+//   radeon_ib_bogus_cleanup(rdev);
+	robj = rdev->ib_pool.robj;
+	rdev->ib_pool.robj = NULL;
+	mutex_unlock(&rdev->ib_pool.mutex);
-	mutex_lock(&rdev->ib_pool.mutex);
-	if (rdev->ib_pool.robj) {
+	if (robj) {
-		r = radeon_bo_reserve(rdev->ib_pool.robj, false);
+		r = radeon_bo_reserve(robj, false);
 		if (likely(r == 0)) {
-			radeon_bo_kunmap(rdev->ib_pool.robj);
+			radeon_bo_kunmap(robj);
-			radeon_bo_unpin(rdev->ib_pool.robj);
+			radeon_bo_unpin(robj);
-			radeon_bo_unreserve(rdev->ib_pool.robj);
+			radeon_bo_unreserve(robj);
-		}
 		radeon_bo_unref(&rdev->ib_pool.robj);
-		rdev->ib_pool.robj = NULL;
 		radeon_bo_unref(&robj);
 	mutex_unlock(&rdev->ib_pool.mutex);
+}
 /*
+ * Ring.
+ */
+void radeon_ring_free_size(struct radeon_device *rdev)
  * Ring.
- */
+	if (rdev->wb.enabled)
-void radeon_ring_free_size(struct radeon_device *rdev)
+		rdev->cp.rptr = le32_to_cpu(rdev->wb.wb[RADEON_WB_CP_RPTR_OFFSET/4]);
 	else {
+	if (rdev->family >= CHIP_R600)
-	if (rdev->family >= CHIP_R600)
+		rdev->cp.rptr = RREG32(R600_CP_RB_RPTR);
-		rdev->cp.rptr = RREG32(R600_CP_RB_RPTR);
+	else
-	else
+	rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
 	rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
 	/* This works because ring_size is a power of 2 */
 	rdev->cp.ring_free_dw = (rdev->cp.rptr + (rdev->cp.ring_size / 4));
 	rdev->cp.ring_free_dw -= rdev->cp.wptr;
 	rdev->cp.ring_free_dw &= rdev->cp.ptr_mask;
 	if (!rdev->cp.ring_free_dw) {
 		rdev->cp.ring_free_dw = rdev->cp.ring_size / 4;
+	}
+}
-int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw)
+int radeon_ring_alloc(struct radeon_device *rdev, unsigned ndw)
-{
 	int r;
 	int r;
 	/* Align requested size with padding so unlock_commit can
-	 * pad safely */
+	/* Align requested size with padding so unlock_commit can
-	ndw = (ndw + rdev->cp.align_mask) & ~rdev->cp.align_mask;
+	 * pad safely */
 	rdev->cp.count_dw = ndw;
 	rdev->cp.wptr_old = rdev->cp.wptr;
 	return 0;
+}
+int radeon_ring_lock(struct radeon_device *rdev, unsigned ndw)
+{
+	int r;
+	mutex_lock(&rdev->cp.mutex);
+	r = radeon_ring_alloc(rdev, ndw);
+	if (r) {
+		mutex_unlock(&rdev->cp.mutex);
+		return r;
+	}
+	return 0;
+}
-void radeon_ring_unlock_commit(struct radeon_device *rdev)
+void radeon_ring_commit(struct radeon_device *rdev)
+{
 	unsigned count_dw_pad;
 	unsigned i;
 	for (i = 0; i < count_dw_pad; i++) {
 		radeon_ring_write(rdev, 2 << 30);
+	}
 	DRM_MEMORYBARRIER();
 	radeon_cp_commit(rdev);
+}
+void radeon_ring_unlock_commit(struct radeon_device *rdev)
+{
+	radeon_ring_commit(rdev);
 	mutex_unlock(&rdev->cp.mutex);
+}
 void radeon_ring_unlock_undo(struct radeon_device *rdev)
 	int r;
 	rdev->cp.ring_size = ring_size;
     /* Allocate ring buffer */
 	if (rdev->cp.ring_obj == NULL) {
-		r = radeon_bo_create(rdev, NULL, rdev->cp.ring_size, true,
+		r = radeon_bo_create(rdev, rdev->cp.ring_size, PAGE_SIZE, true,
 					 RADEON_GEM_DOMAIN_GTT,
 					 &rdev->cp.ring_obj);
 		if (r) {
 			dev_err(rdev->dev, "(%d) ring create failed\n", r);
+}
 void radeon_ring_fini(struct radeon_device *rdev)
+{
+	int r;
-	int r;
+	struct radeon_bo *ring_obj;
-	mutex_lock(&rdev->cp.mutex);
-   if (rdev->cp.ring_obj) {
-		r = radeon_bo_reserve(rdev->cp.ring_obj, false);
-		if (likely(r == 0)) {
-			radeon_bo_kunmap(rdev->cp.ring_obj);
-			radeon_bo_unpin(rdev->cp.ring_obj);
-			radeon_bo_unreserve(rdev->cp.ring_obj);
 	mutex_lock(&rdev->cp.mutex);
-		radeon_bo_unref(&rdev->cp.ring_obj);
+	ring_obj = rdev->cp.ring_obj;
-       rdev->cp.ring = NULL;
-		rdev->cp.ring_obj = NULL;
+	rdev->cp.ring = NULL;
+	rdev->cp.ring_obj = NULL;
+	mutex_unlock(&rdev->cp.mutex);
+	if (ring_obj) {
+		r = radeon_bo_reserve(ring_obj, false);
+		if (likely(r == 0)) {
+			radeon_bo_kunmap(ring_obj);
+			radeon_bo_unpin(ring_obj);
+			radeon_bo_unreserve(ring_obj);
+		}
 		radeon_bo_unref(&ring_obj);
 	mutex_unlock(&rdev->cp.mutex);
+}
 		seq_printf(m, "[%05u]=0x%08X\n", i, ib->ptr[i]);
+	}
 	return 0;
+}
+static int radeon_debugfs_ib_bogus_info(struct seq_file *m, void *data)
+{
+	struct drm_info_node *node = (struct drm_info_node *) m->private;
+	struct radeon_device *rdev = node->info_ent->data;
+	struct radeon_ib *ib;
+	unsigned i;
+	mutex_lock(&rdev->ib_pool.mutex);
+	if (list_empty(&rdev->ib_pool.bogus_ib)) {
+		mutex_unlock(&rdev->ib_pool.mutex);
+		seq_printf(m, "no bogus IB recorded\n");
+		return 0;
+	}
+	ib = list_first_entry(&rdev->ib_pool.bogus_ib, struct radeon_ib, list);
+	list_del_init(&ib->list);
+	mutex_unlock(&rdev->ib_pool.mutex);
+	seq_printf(m, "IB size %05u dwords\n", ib->length_dw);
+	for (i = 0; i < ib->length_dw; i++) {
+		seq_printf(m, "[%05u]=0x%08X\n", i, ib->ptr[i]);
+	}
+	vfree(ib->ptr);
+	kfree(ib);
+	return 0;
+}
 static struct drm_info_list radeon_debugfs_ib_list[RADEON_IB_POOL_SIZE];
+static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32];
+static struct drm_info_list radeon_debugfs_ib_bogus_info_list[] = {
+	{"radeon_ib_bogus", radeon_debugfs_ib_bogus_info, 0, NULL},
-static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32];
+};
 #endif
 int radeon_debugfs_ib_init(struct radeon_device *rdev)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_ring.c – Rev 1430 → 1963