Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
  char/agp: add another Ironlake host bridge
  drm/i915: fix up ivb plane 3 pageflips
  drm/i915: hold forcewake around ring hw init
  drm/i915: Mark the ringbuffers as being in the GTT domain
  drm/i915/crt: Do not rely upon the HPD presence pin
  drm/i915: Reset last_retired_head when resetting ring

diff --combined drivers/gpu/drm/i915/i915_drv.h
index c9cfc67c2cf58acdf7871a6e81fda66d3c45dedb,cff6307576504868163117216f22591ebcc5f812..b0b676abde0de1314f1181f79f1667d35f8eee67
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -285,6 -285,7 +285,7 @@@ struct intel_device_info 
        u8 is_ivybridge:1;
        u8 is_valleyview:1;
        u8 has_pch_split:1;
+       u8 has_force_wake:1;
        u8 is_haswell:1;
        u8 has_fbc:1;
        u8 has_pipe_cxsr:1;
@@@ -942,9 -943,6 +943,9 @@@ struct drm_i915_gem_object 
  
        /* prime dma-buf support */
        struct sg_table *sg_table;
 +      void *dma_buf_vmapping;
 +      int vmapping_count;
 +
        /**
         * Used for performing relocations during execbuffer insertion.
         */
@@@ -1101,6 -1099,8 +1102,8 @@@ struct drm_i915_file_private 
  #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
  #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)
  
+ #define HAS_FORCE_WAKE(dev) (INTEL_INFO(dev)->has_force_wake)
+ 
  #include "i915_trace.h"
  
  /**