diff options
| author |   Michel Dänzer <michel.daenzer@amd.com> | 2014-08-07 16:46:56 +0900 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2014-08-15 00:58:17 -0400 |
| commit | 6f28ef4797fe651aca36430102cff321c172b29b (patch) | |
| tree | 7d078305c7b76fd2660b7b8fe4b9398013e98398 /drivers/gpu/drm/radeon/radeon_vm.c | |
| parent | drm/radeon: add a check for allocation failure (v2) (diff) | |
| download | linux-dev-6f28ef4797fe651aca36430102cff321c172b29b.tar.xz linux-dev-6f28ef4797fe651aca36430102cff321c172b29b.zip | |
drm/radeon: Always flush VM again on < CIK
Not doing this causes piglit hangs[0] on my Cape Verde card. No issues on
Bonaire and Kaveri though.
[0] Same symptoms as those fixed on CIK by 'drm/radeon: set VM base addr
using the PFP v2'.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_vm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c index 9c8358f6f130..058f20085369 100644 --- a/drivers/gpu/drm/radeon/radeon_vm.c +++ b/drivers/gpu/drm/radeon/radeon_vm.c @@ -238,7 +238,9 @@ void radeon_vm_flush(struct radeon_device *rdev, uint64_t pd_addr = radeon_bo_gpu_offset(vm->page_directory); /* if we can't remember our last VM flush then flush now! */ - if (!vm->last_flush || pd_addr != vm->pd_gpu_addr) { + /* XXX figure out why we have to flush all the time before CIK */ + if (rdev->family < CHIP_BONAIRE || + !vm->last_flush || pd_addr != vm->pd_gpu_addr) { trace_radeon_vm_flush(pd_addr, ring, vm->id); vm->pd_gpu_addr = pd_addr; radeon_ring_vm_flush(rdev, ring, vm); |