Attachment 15563 Details for Bug 15203 – r300: Correctly translate the value for the R300_CMD_WAIT command.

[patch] r300: Correctly translate the value for the R300_CMD_WAIT command.

0001-r300-Correctly-translate-the-value-for-the-R300_CMD.patch (text/plain), 2.28 KB, created by Oliver McFadden on 2008-03-29 10:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver McFadden

Created: 2008-03-29 10:53:25 UTC

Size: 2.28 KB

patch

obsolete

>From 1674d2817929fe4ee4e1c4762e89600119dbdc50 Mon Sep 17 00:00:00 2001
>From: Oliver McFadden <z3ro.geek@gmail.com>
>Date: Sat, 29 Mar 2008 17:25:44 +0000
>Subject: [PATCH] r300: Correctly translate the value for the R300_CMD_WAIT command.
>
>Previously, the R300_CMD_WAIT command would write the passed directly to the
>hardware. However this is incorrect because the R300_WAIT_* values used are
>internal interface values that do not map directly to the hardware.
>
>The new function I have added translates the R300_WAIT_* values into appropriate
>values for the hardware before writing the register.
>
>Thanks to John Bridgman for pointing this out. :-)
>---
> shared-core/r300_cmdbuf.c |   39 +++++++++++++++++++++++++++------------
> 1 files changed, 27 insertions(+), 12 deletions(-)
>
>diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
>index 1ae2e67..db5186c 100644
>--- a/shared-core/r300_cmdbuf.c
>+++ b/shared-core/r300_cmdbuf.c
>@@ -736,6 +736,32 @@ static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
> 	buf->used = 0;
> }
> 
>+static void r300_cmd_wait(drm_radeon_private_t * dev_priv,
>+			  drm_r300_cmd_header_t header)
>+{
>+	RING_LOCALS;
>+	u32 wait_until;
>+
>+	if (!header.wait.flags)
>+		return;
>+
>+	wait_until = 0;
>+
>+	if (header.wait.flags & R300_WAIT_2D)
>+		wait_until |= RADEON_WAIT_2D_IDLE;
>+	if (header.wait.flags & R300_WAIT_3D)
>+		wait_until |= RADEON_WAIT_3D_IDLE;
>+	if (header.wait.flags & R300_WAIT_2D_CLEAN)
>+		wait_until |= RADEON_WAIT_2D_IDLECLEAN;
>+	if (header.wait.flags & R300_WAIT_3D_CLEAN)
>+		wait_until |= RADEON_WAIT_3D_IDLECLEAN;
>+
>+	BEGIN_RING(2);
>+	OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
>+	OUT_RING(wait_until);
>+	ADVANCE_RING();
>+}
>+
> static int r300_scratch(drm_radeon_private_t *dev_priv,
> 			drm_radeon_kcmd_buffer_t *cmdbuf,
> 			drm_r300_cmd_header_t header)
>@@ -962,19 +988,8 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
> 			break;
> 
> 		case R300_CMD_WAIT:
>-			/* simple enough, we can do it here */
> 			DRM_DEBUG("R300_CMD_WAIT\n");
>-			if (header.wait.flags == 0)
>-				break;	/* nothing to do */
>-
>-			{
>-				RING_LOCALS;
>-
>-				BEGIN_RING(2);
>-				OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
>-				OUT_RING((header.wait.flags & 0xf) << 14);
>-				ADVANCE_RING();
>-			}
>+			r300_cmd_wait(dev_priv, header);
> 			break;
> 
> 		case R300_CMD_SCRATCH:
>-- 
>1.5.3.7
>

Actions: View | Splinter Review

Attachments on bug 15203: 15455 | 15456 | 15472 | 15493 | 15563 | 15568 | 15593 | 15627 | 15628

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.