diff mbox

drm/radeon: Read back ring buffer before updating WPTR

Message ID 1407487531-2080-1-git-send-email-michel@daenzer.net (mailing list archive)
State New, archived
Headers show

Commit Message

Michel Dänzer Aug. 8, 2014, 8:45 a.m. UTC 
From: Michel Dänzer <michel.daenzer@amd.com>

This fixes a ring test failure reported on a Kabini system which was
triggered by write-combined CPU mappings of the ring buffers.

Reported-and-Tested-by: Will Trives <renevant@internode.on.net>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
 drivers/gpu/drm/radeon/radeon_ring.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Alex Deucher Aug. 8, 2014, 1:36 p.m. UTC | #1 
On Fri, Aug 8, 2014 at 4:45 AM, Michel Dänzer <michel@daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> This fixes a ring test failure reported on a Kabini system which was
> triggered by write-combined CPU mappings of the ring buffers.
>
> Reported-and-Tested-by: Will Trives <renevant@internode.on.net>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>

Applied to my fixes tree.

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_ring.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
> index 5b4e0cf..6dff529 100644
> --- a/drivers/gpu/drm/radeon/radeon_ring.c
> +++ b/drivers/gpu/drm/radeon/radeon_ring.c
> @@ -193,6 +193,10 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
>                 radeon_ring_write(ring, ring->nop);
>         }
>         mb();
> +       /* This is necessary to prevent ring test failures on some systems
> +        * with write-combined CPU mappings of the ring buffers
> +        */
> +       (void)ring->ring[ring->wptr];
>         /* If we are emitting the HDP flush via MMIO, we need to do it after
>          * all CPU writes to VRAM finished.
>          */
> --
> 2.0.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 5b4e0cf..6dff529 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -193,6 +193,10 @@  void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
 		radeon_ring_write(ring, ring->nop);
 	}
 	mb();
+	/* This is necessary to prevent ring test failures on some systems
+	 * with write-combined CPU mappings of the ring buffers
+	 */
+	(void)ring->ring[ring->wptr];
 	/* If we are emitting the HDP flush via MMIO, we need to do it after
 	 * all CPU writes to VRAM finished.
 	 */