From: "Christian König" <deathsimple@vodafone.de>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 15/16] drm/radeon: implement ring commit tracking
Date: Mon, 9 Jul 2012 12:42:02 +0200 [thread overview]
Message-ID: <1341830523-30320-16-git-send-email-deathsimple@vodafone.de> (raw)
In-Reply-To: <1341830523-30320-1-git-send-email-deathsimple@vodafone.de>
Signed-off-by: Christian König <deathsimple@vodafone.de>
---
drivers/gpu/drm/radeon/radeon.h | 3 +++
drivers/gpu/drm/radeon/radeon_ring.c | 39 ++++++++++++++++++++++++++++++++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index fef4257..9c11be8 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -637,6 +637,9 @@ struct radeon_ring {
u32 ptr_reg_shift;
u32 ptr_reg_mask;
u32 nop;
+ unsigned *track_back;
+ unsigned track_ptr;
+ unsigned track_mask;
};
/*
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index d9b2e45..994c98c 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -276,6 +276,8 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
DRM_MEMORYBARRIER();
WREG32(ring->wptr_reg, (ring->wptr << ring->ptr_reg_shift) & ring->ptr_reg_mask);
(void)RREG32(ring->wptr_reg);
+ ring->track_back[ring->track_ptr++] = ring->wptr_old;
+ ring->track_ptr &= ring->track_mask;
}
void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring)
@@ -362,6 +364,27 @@ bool radeon_ring_test_lockup(struct radeon_device *rdev, struct radeon_ring *rin
return false;
}
+static unsigned radeon_ring_first_valid_commit(struct radeon_ring *ring)
+{
+ unsigned i, c, result = ring->track_ptr;
+ i = ring->track_ptr - 1;
+ while (i != ring->track_ptr) {
+ i &= ring->track_mask;
+ c = ring->track_back[i];
+
+ if (ring->wptr >= ring->rptr) {
+ if (c < ring->rptr || c >= ring->wptr)
+ break;
+ } else {
+ if (c < ring->rptr && c >= ring->wptr)
+ break;
+ }
+
+ result = i--;
+ }
+ return result;
+}
+
int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring,
unsigned ring_size, unsigned align,
unsigned rptr_offs, unsigned rptr_reg, unsigned wptr_reg,
@@ -403,6 +426,10 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring,
dev_err(rdev->dev, "(%d) ring map failed\n", r);
return r;
}
+ ring->track_back = kmalloc(ring_size / align, GFP_KERNEL);
+ memset(ring->track_back, 0, ring_size / align);
+ ring->track_ptr = 0;
+ ring->track_mask = ((ring->ring_size / 4) / align) - 1;
}
ring->ptr_mask = (ring->ring_size / 4) - 1;
ring->ring_free_dw = ring->ring_size / 4;
@@ -422,6 +449,7 @@ void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *ring)
ring->ready = false;
ring->ring = NULL;
ring->ring_obj = NULL;
+ kfree(ring->track_back);
mutex_unlock(&rdev->ring_lock);
if (ring_obj) {
@@ -447,7 +475,7 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data)
struct radeon_device *rdev = dev->dev_private;
int ridx = *(int*)node->info_ent->data;
struct radeon_ring *ring = &rdev->ring[ridx];
- unsigned count, i, j;
+ unsigned count, i, j, commit;
radeon_ring_free_size(rdev, ring);
count = (ring->ring_size / 4) - ring->ring_free_dw;
@@ -457,9 +485,16 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data)
seq_printf(m, "driver's copy of the rptr: 0x%08x\n", ring->rptr);
seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw);
seq_printf(m, "%u dwords in ring\n", count);
+ commit = radeon_ring_first_valid_commit(ring);
i = ring->rptr;
for (j = 0; j <= count; j++) {
- seq_printf(m, "r[%04d]=0x%08x\n", i, ring->ring[i]);
+ seq_printf(m, "r[%04x]=0x%08x", i, ring->ring[i]);
+ if (commit != ring->track_ptr && ring->track_back[commit] == i) {
+ seq_printf(m, " <-");
+ ++commit;
+ commit &= ring->track_mask;
+ }
+ seq_printf(m, "\n");
i = (i + 1) & ring->ptr_mask;
}
return 0;
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2012-07-09 10:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 10:41 [RFC] drm/radeon: restoring ring commands in case of a lockup Christian König
2012-07-09 10:41 ` [PATCH 01/16] drm/radeon: add error handling to fence_wait_empty_locked Christian König
2012-07-09 10:41 ` [PATCH 02/16] drm/radeon: add error handling to radeon_vm_unbind_locked Christian König
2012-07-09 10:41 ` [PATCH 03/16] drm/radeon: fix fence related segfault in CS Christian König
2012-07-09 10:41 ` [PATCH 04/16] drm/radeon: add an exclusive lock for GPU reset v2 Christian König
2012-07-09 10:41 ` [PATCH 05/16] drm/radeon: fix ring commit padding Christian König
2012-07-09 10:41 ` [PATCH 06/16] drm/radeon: fix fence value access Christian König
2012-07-09 10:41 ` [PATCH 07/16] drm/radeon: fix fence init after resume Christian König
2012-07-09 10:41 ` [PATCH 08/16] drm/radeon: remove FIXME comment from chipset suspend Christian König
2012-07-09 10:41 ` [PATCH 09/16] drm/radeon: make cp init on cayman more robust Christian König
2012-07-09 14:43 ` Jerome Glisse
2012-07-09 15:11 ` Christian König
2012-07-09 10:41 ` [PATCH 10/16] drm/radeon: remove ip_pool start/suspend Christian König
2012-07-09 10:41 ` [PATCH 11/16] drm/radeon: remove r600_blit_suspend Christian König
2012-07-09 10:41 ` [PATCH 12/16] drm/radeon: remove vm_manager start/suspend Christian König
2012-07-09 10:42 ` [PATCH 13/16] drm/radeon: move radeon_ib_ring_tests out of chipset code Christian König
2012-07-09 15:06 ` Michel Dänzer
2012-07-09 15:22 ` Christian König
2012-07-09 15:36 ` Michel Dänzer
2012-07-09 10:42 ` [PATCH 14/16] drm/radeon: make align a ring_init parameter Christian König
2012-07-09 10:42 ` Christian König [this message]
2012-07-09 15:36 ` [PATCH 15/16] drm/radeon: implement ring commit tracking Jerome Glisse
2012-07-09 15:48 ` Christian König
2012-07-09 16:12 ` Jerome Glisse
2012-07-09 10:42 ` [PATCH 16/16] drm/radeon: implement ring saving on reset Christian König
2012-07-09 15:06 ` Michel Dänzer
2012-07-09 15:24 ` Christian König
2012-07-09 15:59 ` [RFC] drm/radeon: restoring ring commands in case of a lockup Michel Dänzer
2012-07-09 16:10 ` Jerome Glisse
2012-07-10 12:54 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341830523-30320-16-git-send-email-deathsimple@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.