On Wed, Jul 30, 2014 at 11:18 AM, Christian König
<deathsimple@xxxxxxxxxxx> wrote:
> From: Christian König <christian.koenig@xxxxxxx>
>
> Seems to make VM flushes more stable on SI and CIK.
>
> v2: only use the PFP on the GFX ring on CIK
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
Applied to my 3.17 tree. We should use PFP whenever possible for all packets.
Alex
> ---
> drivers/gpu/drm/radeon/cik.c | 5 +++--
> drivers/gpu/drm/radeon/si.c | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index cc1f02f..db53616 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -5641,12 +5641,13 @@ static void cik_vm_decode_fault(struct radeon_device *rdev,
> void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
> {
> struct radeon_ring *ring = &rdev->ring[ridx];
> + int usepfp = (ridx == RADEON_RING_TYPE_GFX_INDEX);
>
> if (vm == NULL)
> return;
>
> radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
> - radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
> + radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
> WRITE_DATA_DST_SEL(0)));
> if (vm->id < 8) {
> radeon_ring_write(ring,
> @@ -5696,7 +5697,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
> radeon_ring_write(ring, 1 << vm->id);
>
> /* compute doesn't have PFP */
> - if (ridx == RADEON_RING_TYPE_GFX_INDEX) {
> + if (usepfp) {
> /* 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/si.c b/drivers/gpu/drm/radeon/si.c
> index 9e854fd..f87d82a 100644
> --- a/drivers/gpu/drm/radeon/si.c
> +++ b/drivers/gpu/drm/radeon/si.c
> @@ -4815,7 +4815,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
>
> /* write new base address */
> radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
> - radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
> + radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) |
> WRITE_DATA_DST_SEL(0)));
>
> if (vm->id < 8) {
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
