Attachment 30926 Details for Bug 24535 – don't RMW cp_rb_cntl

[patch] don't RMW cp_rb_cntl

0001-drm-radeon-kms-r600-don-t-RMW-CP_RB_CNTL.patch (text/plain), 1.41 KB, created by Alex Deucher on 2009-11-02 12:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-11-02 12:41:03 UTC

Size: 1.41 KB

patch

obsolete

>From c2157aaf5be50b65fd42581f2098582ed32cf67c Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Mon, 2 Nov 2009 15:34:14 -0500
>Subject: [PATCH] drm/radeon/kms/r600: don't RMW CP_RB_CNTL
>
>Readback of this reg seems faulty at times.
>
>Should fix bug 24535 and possibly 24218
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/r600.c |    8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index e87475c..60fbb23 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1272,19 +1272,17 @@ int r600_cp_resume(struct radeon_device *rdev)
> 
> 	/* Set ring buffer size */
> 	rb_bufsz = drm_order(rdev->cp.ring_size / 8);
>+	tmp = RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
> #ifdef __BIG_ENDIAN
>-	WREG32(CP_RB_CNTL, BUF_SWAP_32BIT | RB_NO_UPDATE |
>-		(drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz);
>-#else
>-	WREG32(CP_RB_CNTL, RB_NO_UPDATE | (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz);
>+	tmp |= BUF_SWAP_32BIT;
> #endif
>+	WREG32(CP_RB_CNTL, tmp);
> 	WREG32(CP_SEM_WAIT_TIMER, 0x4);
> 
> 	/* Set the write pointer delay */
> 	WREG32(CP_RB_WPTR_DELAY, 0);
> 
> 	/* Initialize the ring buffer's read and write pointers */
>-	tmp = RREG32(CP_RB_CNTL);
> 	WREG32(CP_RB_CNTL, tmp | RB_RPTR_WR_ENA);
> 	WREG32(CP_RB_RPTR_WR, 0);
> 	WREG32(CP_RB_WPTR, 0);
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 24535: 30577 | 30600 | 30913 | 30914 | 30915 | 30916 | 30919 | 30920 | 30923 | 30925 | 30926 | 30930

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.