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/evergreen.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/evergreen.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 1c7af5654336..233cbc0a2b59 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1448,7 +1448,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) | |||
1448 | tmp |= BUF_SWAP_32BIT; | 1448 | tmp |= BUF_SWAP_32BIT; |
1449 | #endif | 1449 | #endif |
1450 | WREG32(CP_RB_CNTL, tmp); | 1450 | WREG32(CP_RB_CNTL, tmp); |
1451 | WREG32(CP_SEM_WAIT_TIMER, 0x4); | 1451 | WREG32(CP_SEM_WAIT_TIMER, 0x0); |
1452 | 1452 | ||
1453 | /* Set the write pointer delay */ | 1453 | /* Set the write pointer delay */ |
1454 | WREG32(CP_RB_WPTR_DELAY, 0); | 1454 | WREG32(CP_RB_WPTR_DELAY, 0); |
@@ -3290,6 +3290,7 @@ void evergreen_fini(struct radeon_device *rdev) | |||
3290 | evergreen_pcie_gart_fini(rdev); | 3290 | evergreen_pcie_gart_fini(rdev); |
3291 | r600_vram_scratch_fini(rdev); | 3291 | r600_vram_scratch_fini(rdev); |
3292 | radeon_gem_fini(rdev); | 3292 | radeon_gem_fini(rdev); |
3293 | radeon_semaphore_driver_fini(rdev); | ||
3293 | radeon_fence_driver_fini(rdev); | 3294 | radeon_fence_driver_fini(rdev); |
3294 | radeon_agp_fini(rdev); | 3295 | radeon_agp_fini(rdev); |
3295 | radeon_bo_fini(rdev); | 3296 | radeon_bo_fini(rdev); |