drm/i915: Use chipset-specific irq installers

[pandora-kernel.git] / drivers / gpu / drm / i915 / i915_gem_evict.c

diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index 3d39005..da05a26 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -30,6 +30,7 @@
 #include "drm.h"
 #include "i915_drv.h"
 #include "i915_drm.h"
+#include "i915_trace.h"
 
 static bool
 mark_free(struct drm_i915_gem_object *obj, struct list_head *unwind)
@@ -63,6 +64,8 @@ i915_gem_evict_something(struct drm_device *dev, int min_size,
                        return 0;
        }
 
+       trace_i915_gem_evict(dev, min_size, alignment, mappable);
+
        /*
         * The goal is to evict objects and amalgamate space in LRU order.
         * The oldest idle objects reside on the inactive list, which is in
@@ -189,6 +192,8 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only)
        if (lists_empty)
                return -ENOSPC;
 
+       trace_i915_gem_evict_everything(dev, purgeable_only);
+
        /* Flush everything (on to the inactive lists) and evict */
        ret = i915_gpu_idle(dev);
        if (ret)