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>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 4563e50cbdde46625e9df4073cf10c2d6ca1bc26..586f30e2cec83019e4ae6bc7fc07667dad3d579b 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1059,6 +1059,8 @@ struct radeon_power_state {
 
 struct radeon_pm {
        struct mutex            mutex;
+       /* write locked while reprogramming mclk */
+       struct rw_semaphore     mclk_lock;
        u32                     active_crtcs;
        int                     active_crtc_count;
        int                     req_vblank;
@@ -1554,7 +1556,6 @@ struct radeon_device {
        struct work_struct audio_work;
        int num_crtc; /* number of crtcs */
        struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */
-       struct mutex vram_mutex;
        bool audio_enabled;
        struct r600_audio audio_status; /* audio stuff */
        struct notifier_block acpi_nb;

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 066c98b888a51b4409323d5300863cf9b9fd7381..7667184ab0bf5edc2a67e0277f2e179368e62927 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -735,7 +735,7 @@ int radeon_device_init(struct radeon_device *rdev,
                spin_lock_init(&rdev->ih.lock);
        mutex_init(&rdev->gem.mutex);
        mutex_init(&rdev->pm.mutex);
-       mutex_init(&rdev->vram_mutex);
+       init_rwsem(&rdev->pm.mclk_lock);
        init_waitqueue_head(&rdev->irq.vblank_queue);
        init_waitqueue_head(&rdev->irq.idle_queue);
        r = radeon_gem_init(rdev);

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 830f1a7b486f2b3181968b76408b3f1175698639..6ecb2006e27eb0ac325bc173d76b075d150268b6 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -154,11 +154,11 @@ retry:
        INIT_LIST_HEAD(&bo->va);
        radeon_ttm_placement_from_domain(bo, domain);
        /* Kernel allocation are uninterruptible */
-       mutex_lock(&rdev->vram_mutex);
+       down_read(&rdev->pm.mclk_lock);
        r = ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type,
                        &bo->placement, page_align, 0, !kernel, NULL,
                        acc_size, sg, &radeon_ttm_bo_destroy);
-       mutex_unlock(&rdev->vram_mutex);
+       up_read(&rdev->pm.mclk_lock);
        if (unlikely(r != 0)) {
                if (r != -ERESTARTSYS) {
                        if (domain == RADEON_GEM_DOMAIN_VRAM) {
@@ -219,9 +219,9 @@ void radeon_bo_unref(struct radeon_bo **bo)
                return;
        rdev = (*bo)->rdev;
        tbo = &((*bo)->tbo);
-       mutex_lock(&rdev->vram_mutex);
+       down_read(&rdev->pm.mclk_lock);
        ttm_bo_unref(&tbo);
-       mutex_unlock(&rdev->vram_mutex);
+       up_read(&rdev->pm.mclk_lock);
        if (tbo == NULL)
                *bo = NULL;
 }

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 5b37e283ec38575a86d59a695b1f453251f9ae43..9dc0b54fe3e377f480492e2a7ceee55ed249921d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -251,7 +251,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
                return;
 
        mutex_lock(&rdev->ddev->struct_mutex);
-       mutex_lock(&rdev->vram_mutex);
+       down_write(&rdev->pm.mclk_lock);
        mutex_lock(&rdev->ring_lock);
 
        /* gui idle int has issues on older chips it seems */
@@ -303,7 +303,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
        rdev->pm.dynpm_planned_action = DYNPM_ACTION_NONE;
 
        mutex_unlock(&rdev->ring_lock);
-       mutex_unlock(&rdev->vram_mutex);
+       up_write(&rdev->pm.mclk_lock);
        mutex_unlock(&rdev->ddev->struct_mutex);
 }
 

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index c43035c5cc3efc2bd033bf465dafc821f0b07f1f..0881131a03888f699403fb9ccc7b2d64f7232df6 100644 (file)
--- 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;
 }