Merge tag 'drm-intel-next-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Need to get my stuff out the door ;-) Highlights:
- pc8+ support from Paulo
- more vma patches from Ben.
- Kconfig option to enable preliminary support by default (Josh
  Triplett)
- Optimized cpu cache flush handling and support for write-through caching
  of display planes on Iris (Chris)
- rc6 tuning from Stéphane Marchesin for more stability
- VECS seqno wrap/semaphores fix (Ben)
- a pile of smaller cleanups and improvements all over

Note that I've ditched Ben's execbuf vma conversion for 3.12 since not yet
ready. But there's still other vma conversion stuff in here.

* tag 'drm-intel-next-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel: (62 commits)
  drm/i915: Print seqnos as unsigned in debugfs
  drm/i915: Fix context size calculation on SNB/IVB/VLV
  drm/i915: Use POSTING_READ in lcpll code
  drm/i915: enable Package C8+ by default
  drm/i915: add i915.pc8_timeout function
  drm/i915: add i915_pc8_status debugfs file
  drm/i915: allow package C8+ states on Haswell (disabled)
  drm/i915: fix SDEIMR assertion when disabling LCPLL
  drm/i915: grab force_wake when restoring LCPLL
  drm/i915: drop WaMbcDriverBootEnable workaround
  drm/i915: Cleaning up the relocate entry function
  drm/i915: merge HSW and SNB PM irq handlers
  drm/i915: fix how we mask PMIMR when adding work to the queue
  drm/i915: don't queue PM events we won't process
  drm/i915: don't disable/reenable IVB error interrupts when not needed
  drm/i915: add dev_priv->pm_irq_mask
  drm/i915: don't update GEN6_PMIMR when it's not needed
  drm/i915: wrap GEN6_PMIMR changes
  drm/i915: wrap GTIMR changes
  drm/i915: add the FCLK case to intel_ddi_get_cdclk_freq
  ...

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index 425939b7d343..91b700155850 100644
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -37,7 +37,7 @@ mark_free(struct i915_vma *vma, struct list_head *unwind)
         if (vma->obj->pin_count)
                 return false;
 
-        list_add(&vma->obj->exec_list, unwind);
+        list_add(&vma->exec_list, unwind);
         return drm_mm_scan_add_block(&vma->node);
 }
 
@@ -49,7 +49,6 @@ i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm,
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct list_head eviction_list, unwind_list;
         struct i915_vma *vma;
-        struct drm_i915_gem_object *obj;
         int ret = 0;
 
         trace_i915_gem_evict(dev, min_size, alignment, mappable);
@@ -104,14 +103,13 @@ i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm,
 none:
         /* Nothing found, clean up and bail out! */
         while (!list_empty(&unwind_list)) {
-                obj = list_first_entry(&unwind_list,
-                                       struct drm_i915_gem_object,
+                vma = list_first_entry(&unwind_list,
+                                       struct i915_vma,
                                        exec_list);
-                vma = i915_gem_obj_to_vma(obj, vm);
                 ret = drm_mm_scan_remove_block(&vma->node);
                 BUG_ON(ret);
 
-                list_del_init(&obj->exec_list);
+                list_del_init(&vma->exec_list);
         }
 
         /* We expect the caller to unpin, evict all and try again, or give up.
@@ -125,28 +123,30 @@ found:
          * temporary list. */
         INIT_LIST_HEAD(&eviction_list);
         while (!list_empty(&unwind_list)) {
-                obj = list_first_entry(&unwind_list,
-                                       struct drm_i915_gem_object,
+                vma = list_first_entry(&unwind_list,
+                                       struct i915_vma,
                                        exec_list);
-                vma = i915_gem_obj_to_vma(obj, vm);
                 if (drm_mm_scan_remove_block(&vma->node)) {
-                        list_move(&obj->exec_list, &eviction_list);
-                        drm_gem_object_reference(&obj->base);
+                        list_move(&vma->exec_list, &eviction_list);
+                        drm_gem_object_reference(&vma->obj->base);
                         continue;
                 }
-                list_del_init(&obj->exec_list);
+                list_del_init(&vma->exec_list);
         }
 
         /* Unbinding will emit any required flushes */
         while (!list_empty(&eviction_list)) {
-                obj = list_first_entry(&eviction_list,
-                                       struct drm_i915_gem_object,
+                struct drm_gem_object *obj;
+                vma = list_first_entry(&eviction_list,
+                                       struct i915_vma,
                                        exec_list);
+
+                obj =  &vma->obj->base;
+                list_del_init(&vma->exec_list);
                 if (ret == 0)
-                        ret = i915_vma_unbind(i915_gem_obj_to_vma(obj, vm));
+                        ret = i915_vma_unbind(vma);
 
-                list_del_init(&obj->exec_list);
-                drm_gem_object_unreference(&obj->base);
+                drm_gem_object_unreference(obj);
         }
 
         return ret;