Attachment 68516 Details for Bug 55692 – Possible fix rebased on correct branch.

Possible fix rebased on correct branch.

0001-drm-radeon-fix-PFP-sync-in-vm_flush.patch (text/plain), 2.23 KB, created by Christian König on 2012-10-13 10:37:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2012-10-13 10:37:44 UTC

Size: 2.23 KB

patch

obsolete

>From 7e9f9bbc2436dc55d6ef3382fdb392809a9a1d51 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <deathsimple@vodafone.de>
>Date: Sat, 13 Oct 2012 12:24:23 +0200
>Subject: [PATCH 01/13] drm/radeon: fix PFP sync in vm_flush
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Otherwise the next IB might start reading commands
>with the page table still invalid.
>
>Signed-off-by: Christian KÃ¶nig <deathsimple@vodafone.de>
>---
> drivers/gpu/drm/radeon/ni.c  |    4 ++++
> drivers/gpu/drm/radeon/nid.h |    1 +
> drivers/gpu/drm/radeon/si.c  |    4 ++++
> 3 files changed, 9 insertions(+)
>
>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index 9a46f7d..b08a386 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -1588,4 +1588,8 @@ void cayman_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
> 	/* bits 0-7 are the VM contexts0-7 */
> 	radeon_ring_write(ring, PACKET0(VM_INVALIDATE_REQUEST, 0));
> 	radeon_ring_write(ring, 1 << vm->id);
>+
>+	/* sync PFP to ME, otherwise we might get invalid PFP reads */
>+	radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
>+	radeon_ring_write(ring, 0x0);
> }
>diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h
>index 2423d1b..cbef681 100644
>--- a/drivers/gpu/drm/radeon/nid.h
>+++ b/drivers/gpu/drm/radeon/nid.h
>@@ -502,6 +502,7 @@
> #define	PACKET3_MPEG_INDEX				0x3A
> #define	PACKET3_WAIT_REG_MEM				0x3C
> #define	PACKET3_MEM_WRITE				0x3D
>+#define	PACKET3_PFP_SYNC_ME				0x42
> #define	PACKET3_SURFACE_SYNC				0x43
> #              define PACKET3_CB0_DEST_BASE_ENA    (1 << 6)
> #              define PACKET3_CB1_DEST_BASE_ENA    (1 << 7)
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index c76825f..cbc620d 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -2867,6 +2867,10 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
> 	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
> 	radeon_ring_write(ring, 0);
> 	radeon_ring_write(ring, 1 << vm->id);
>+
>+	/* sync PFP to ME, otherwise we might get invalid PFP reads */
>+	radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
>+	radeon_ring_write(ring, 0x0);
> }
> 
> /*
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 55692: 68153 | 68154 | 68155 | 68156 | 68157 | 68159 | 68515 | 68516 | 68519 | 68531 | 68623 | 68655 | 68728 | 68906 | 68932 | 68933

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.