diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-05-11 14:57:18 +0200 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2012-06-21 09:38:43 +0200 |
| commit | db7fce3983ad9b3deebda450121af4aaf6809ce2 (patch) | |
| tree | c2a0b36453630f26a752ad59fb241c2e5189f997 /drivers/gpu/drm/radeon/radeon_ttm.c | |
| parent | 220907d9835ce5181b9f782c862b1ee7a4d24c23 (diff) | |
| download | blackbird-op-linux-db7fce3983ad9b3deebda450121af4aaf6809ce2.tar.gz blackbird-op-linux-db7fce3983ad9b3deebda450121af4aaf6809ce2.zip | |
drm/radeon: replace vmram_mutex with mclk_lock v2
It is a rw_semaphore now and only write locked
while changing the clock. Also the lock is renamed
to better reflect what it is protecting.
v2: Keep the ttm_vm_ops on IGPs
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index c43035c5cc3e..0881131a0388 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -797,9 +797,9 @@ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) return VM_FAULT_NOPAGE; } rdev = radeon_get_rdev(bo->bdev); - mutex_lock(&rdev->vram_mutex); + down_read(&rdev->pm.mclk_lock); r = ttm_vm_ops->fault(vma, vmf); - mutex_unlock(&rdev->vram_mutex); + up_read(&rdev->pm.mclk_lock); return r; } |
