Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c

diff --cc linux-core/Makefile.kernel
index 47364b1,e7c280d..63c93f0
--- 1/linux-core/Makefile.kernel
--- 2/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@@ -13,8 -13,8 +13,8 @@@ drm-objs    := drm_auth.o drm_bufs.o dr
                drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \
                drm_memory_debug.o ati_pcigart.o drm_sman.o \
                drm_hashtab.o drm_mm.o drm_object.o drm_compat.o \
 -              drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_bo_lock.o \
 -              drm_regman.o
 +              drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_crtc.o \
-               drm_edid.o drm_modes.o drm_bo_lock.o
++              drm_edid.o drm_modes.o drm_bo_lock.o drm_regman.o
  tdfx-objs   := tdfx_drv.o
  r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
  mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o

diff --cc linux-core/drm_bo.c
Simple merge

diff --cc linux-core/i915_buffer.c
Simple merge

diff --cc linux-core/i915_fence.c
index 068c8be,e3c76df..21d032b
--- 1/linux-core/i915_fence.c
--- 2/linux-core/i915_fence.c
+++ b/linux-core/i915_fence.c
@@@ -38,9 -38,9 +38,9 @@@
   * Implements an intel sync flush operation.
   */
  
- static void i915_perform_flush(struct drm_device * dev)
+ static void i915_perform_flush(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        struct drm_fence_manager *fm = &dev->fm;
        struct drm_fence_class_manager *fc = &fm->fence_class[0];
        struct drm_fence_driver *driver = dev->driver->fence_driver;
@@@ -120,10 -120,11 +120,11 @@@ void i915_poke_flush(struct drm_device 
        write_unlock_irqrestore(&fm->lock, flags);
  }
  
- int i915_fence_emit_sequence(struct drm_device * dev, uint32_t class, uint32_t flags,
-                            uint32_t * sequence, uint32_t * native_type)
+ int i915_fence_emit_sequence(struct drm_device *dev, uint32_t class,
+                            uint32_t flags, uint32_t *sequence,
+                            uint32_t *native_type)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        if (!dev_priv)
                return -EINVAL;
  

diff --cc shared-core/i915_dma.c
index ed3a07d,541b4cc..47befeb
--- 1/shared-core/i915_dma.c
--- 2/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@@ -1312,4 -1399,11 +1312,3 @@@ int i915_driver_device_is_agp(struct dr
        return 1;
  }
  
- 
 -int i915_driver_firstopen(struct drm_device *dev)
 -{
 -#ifdef I915_HAVE_BUFFER
 -      if (!IS_I9XX(dev))
 -              drm_bo_driver_init(dev);
 -#endif
 -      return 0;
 -}

diff --cc shared-core/i915_drv.h
Simple merge

diff --cc shared-core/i915_irq.c
index edb6122,2c699ec..bd57607
--- 1/shared-core/i915_irq.c
--- 2/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@@ -365,10 -365,9 +365,10 @@@ irqreturn_t i915_driver_irq_handler(DRM
        return IRQ_HANDLED;
  }
  
- int i915_emit_irq(struct drm_device * dev)
+ int i915_emit_irq(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        RING_LOCALS;
  
        i915_kernel_lost_context(dev);
@@@ -383,11 -382,9 +383,9 @@@
        ADVANCE_LP_RING();
  
        return dev_priv->counter;
- 
- 
  }
  
 -void i915_user_irq_on(drm_i915_private_t *dev_priv)
 +void i915_user_irq_on(struct drm_i915_private *dev_priv)
  {
        DRM_SPINLOCK(&dev_priv->user_irq_lock);
        if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1)){
@@@ -484,10 -468,11 +482,11 @@@ int i915_driver_vblank_wait2(struct drm
  
  /* Needs the lock as it touches the ring.
   */
- int i915_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv)
+ int i915_irq_emit(struct drm_device *dev, void *data,
+                        struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_irq_emit_t *emit = data;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_irq_emit *emit = data;
        int result;
  
        LOCK_TEST_WITH_RETURN(dev, file_priv);
@@@ -766,8 -750,9 +765,9 @@@ void i915_driver_irq_postinstall(struc
  
  void i915_driver_irq_uninstall(struct drm_device * dev)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        u16 temp;
+ 
        if (!dev_priv)
                return;