MALI: rockchip: upgrade midgard DDK to r14p0-01rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / backend / gpu / mali_kbase_js_affinity.c

diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c
index d665420ab3805788605cc95d5d1c028164c4865a..54d8ddd800976045ab8cd050e92547f374f4791c 100644 (file)
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_js_affinity.c
@@ -94,9 +94,8 @@ bool kbase_js_choose_affinity(u64 * const affinity,
        base_jd_core_req core_req = katom->core_req;
        unsigned int num_core_groups = kbdev->gpu_props.num_core_groups;
        u64 core_availability_mask;
-       unsigned long flags;
 
-       spin_lock_irqsave(&kbdev->pm.power_change_lock, flags);
+       lockdep_assert_held(&kbdev->hwaccess_lock);
 
        core_availability_mask = kbase_pm_ca_get_core_mask(kbdev);
 
@@ -105,7 +104,6 @@ bool kbase_js_choose_affinity(u64 * const affinity,
         * transitioning) then fail.
         */
        if (0 == core_availability_mask) {
-               spin_unlock_irqrestore(&kbdev->pm.power_change_lock, flags);
                *affinity = 0;
                return false;
        }
@@ -114,7 +112,6 @@ bool kbase_js_choose_affinity(u64 * const affinity,
 
        if ((core_req & (BASE_JD_REQ_FS | BASE_JD_REQ_CS | BASE_JD_REQ_T)) ==
                                                                BASE_JD_REQ_T) {
-               spin_unlock_irqrestore(&kbdev->pm.power_change_lock, flags);
                 /* If the hardware supports XAFFINITY then we'll only enable
                  * the tiler (which is the default so this is a no-op),
                  * otherwise enable shader core 0. */
@@ -169,8 +166,6 @@ bool kbase_js_choose_affinity(u64 * const affinity,
                }
        }
 
-       spin_unlock_irqrestore(&kbdev->pm.power_change_lock, flags);
-
        /*
         * If no cores are currently available in the desired core group(s)
         * (core availability policy is transitioning) then fail.