diff options
author | Christian König <deathsimple@vodafone.de> | 2011-09-15 13:02:22 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:49:36 -0500 |
commit | 15d3332f31afd571a6d23971dbc8d8db2856e661 (patch) | |
tree | 71610dd9dd6c455fe2f4ec3639691b10388d1dab /drivers/gpu/drm/radeon/ni.c | |
parent | 7465280c076d6440e5908c158c83b542dc063a30 (diff) |
drm/radeon/kms: add support for semaphores v3
They are used to sync between rings, while fences
sync between a ring and the cpu.
v2 Fix radeon_semaphore_driver_fini when no semaphore were
allocated.
v3 Initialize list early on to avoid issue in case or early
error
Signed-off-by: Christian König <deathsimple@vodafone.de>
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 710ad8c82767..ef749950db08 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1136,7 +1136,7 @@ int cayman_cp_resume(struct radeon_device *rdev) | |||
1136 | WREG32(GRBM_SOFT_RESET, 0); | 1136 | WREG32(GRBM_SOFT_RESET, 0); |
1137 | RREG32(GRBM_SOFT_RESET); | 1137 | RREG32(GRBM_SOFT_RESET); |
1138 | 1138 | ||
1139 | WREG32(CP_SEM_WAIT_TIMER, 0x4); | 1139 | WREG32(CP_SEM_WAIT_TIMER, 0x0); |
1140 | 1140 | ||
1141 | /* Set the write pointer delay */ | 1141 | /* Set the write pointer delay */ |
1142 | WREG32(CP_RB_WPTR_DELAY, 0); | 1142 | WREG32(CP_RB_WPTR_DELAY, 0); |
@@ -1557,6 +1557,7 @@ void cayman_fini(struct radeon_device *rdev) | |||
1557 | cayman_pcie_gart_fini(rdev); | 1557 | cayman_pcie_gart_fini(rdev); |
1558 | r600_vram_scratch_fini(rdev); | 1558 | r600_vram_scratch_fini(rdev); |
1559 | radeon_gem_fini(rdev); | 1559 | radeon_gem_fini(rdev); |
1560 | radeon_semaphore_driver_fini(rdev); | ||
1560 | radeon_fence_driver_fini(rdev); | 1561 | radeon_fence_driver_fini(rdev); |
1561 | radeon_bo_fini(rdev); | 1562 | radeon_bo_fini(rdev); |
1562 | radeon_atombios_fini(rdev); | 1563 | radeon_atombios_fini(rdev); |