Attachment 26351 Details for Bug 21849 – attempt to change ring alignment rules

[patch] attempt to change ring alignment rules

radeon-test-ring.patch (text/plain), 1.38 KB, created by Dave Airlie on 2009-06-02 03:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2009-06-02 03:19:15 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
>index 77a7a4d..aff90bb 100644
>--- a/drivers/gpu/drm/radeon/radeon_cp.c
>+++ b/drivers/gpu/drm/radeon/radeon_cp.c
>@@ -2185,9 +2185,9 @@ void radeon_commit_ring(drm_radeon_private_t *dev_priv)
> 
> 	/* check if the ring is padded out to 16-dword alignment */
> 
>-	tail_aligned = dev_priv->ring.tail & 0xf;
>+	tail_aligned = dev_priv->ring.tail & (RADEON_RING_ALIGN-1);
> 	if (tail_aligned) {
>-		int num_p2 = 16 - tail_aligned;
>+		int num_p2 = RADEON_RING_ALIGN - tail_aligned;
> 
> 		ring = dev_priv->ring.start;
> 		/* pad with some CP_PACKET2 */
>diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
>index 8071d96..0c6bfc1 100644
>--- a/drivers/gpu/drm/radeon/radeon_drv.h
>+++ b/drivers/gpu/drm/radeon/radeon_drv.h
>@@ -1964,11 +1964,14 @@ do {								\
> 
> #define RING_LOCALS	int write, _nr, _align_nr; unsigned int mask; u32 *ring;
> 
>+#define RADEON_RING_ALIGN 16
>+
> #define BEGIN_RING( n ) do {						\
> 	if ( RADEON_VERBOSE ) {						\
> 		DRM_INFO( "BEGIN_RING( %d )\n", (n));			\
> 	}								\
>-	_align_nr = (n + 0xf) & ~0xf;					\
>+	_align_nr = RADEON_RING_ALIGN - ((dev_priv->ring.tail + n) & (RADEON_RING_ALIGN-1));	\
>+	_align_nr += n;							\
> 	if (dev_priv->ring.space <= (_align_nr * sizeof(u32))) {	\
>                 COMMIT_RING();						\
> 		radeon_wait_ring( dev_priv, _align_nr * sizeof(u32));	\

Actions: View | Splinter Review

Attachments on bug 21849: 26351

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.