drm/i915: Avoid concurrent access when marking the device as idle/busy

As suggested by Daniel, rip out the independent timers for device and
crtc busyness and integrate the manual powermanagement of the display
engine into the GEM core and its request tracking. The benefits are that
the code is a lot smaller, fewer moving parts and should fit more neatly
into the overall activity tracking of the driver.

v2: Complete overhaul and removal of the racy timers and workers.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 94aabcaa3a67..85d1b1c57df2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3075,14 +3075,17 @@ EXPORT_SYMBOL_GPL(i915_gpu_lower);
 bool i915_gpu_busy(void)
 {
         struct drm_i915_private *dev_priv;
+        struct intel_ring_buffer *ring;
         bool ret = false;
+        int i;
 
         spin_lock(&mchdev_lock);
         if (!i915_mch_dev)
                 goto out_unlock;
         dev_priv = i915_mch_dev;
 
-        ret = dev_priv->busy;
+        for_each_ring(ring, dev_priv, i)
+                ret |= !list_empty(&ring->request_list);
 
 out_unlock:
         spin_unlock(&mchdev_lock);