MALI: rockchip: upgrade midgard DDK to r13p0-00rel0

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

diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c
index 9dac2303bd00a81ef81868570b4e8121ba71a4d1..81322fd0dd1757fdd9f51b1546ed7c42ca0dd21e 100644 (file)
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_pm_demand.c
@@ -1,6 +1,6 @@
 /*
  *
- * (C) COPYRIGHT 2010-2015 ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2010-2016 ARM Limited. All rights reserved.
  *
  * This program is free software and is provided to you under the terms of the
  * GNU General Public License version 2 as published by the Free Software
@@ -37,7 +37,8 @@ static u64 demand_get_core_mask(struct kbase_device *kbdev)
 static bool demand_get_core_active(struct kbase_device *kbdev)
 {
        if (0 == kbdev->pm.active_count && !(kbdev->shader_needed_bitmap |
-                       kbdev->shader_inuse_bitmap))
+                       kbdev->shader_inuse_bitmap) && !kbdev->tiler_needed_cnt
+                       && !kbdev->tiler_inuse_cnt)
                return false;
 
        return true;