Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_irq.c
index 8304c42195fc455e88e58629ab44d75c19ce37da,16d5155edad14fd63dea3b10243a71c6bd3d0ea1..0054e957203f2c5900fd58165fe0a2143401d4be
--- 1/drivers/gpu/drm/drm_irq.c
--- 2/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@@ -1088,13 -626,11 +1088,13 @@@ static int drm_queue_vblank_event(struc
  
        e->event.sequence = vblwait->request.sequence;
        if ((seq - vblwait->request.sequence) <= (1 << 23)) {
 +              e->event.sequence = seq;
                e->event.tv_sec = now.tv_sec;
                e->event.tv_usec = now.tv_usec;
-               drm_vblank_put(dev, e->pipe);
+               drm_vblank_put(dev, pipe);
                list_add_tail(&e->base.link, &e->base.file_priv->event_list);
                wake_up_interruptible(&e->base.file_priv->event_wait);
 +              vblwait->reply.sequence = seq;
                trace_drm_vblank_event_delivered(current->pid, pipe,
                                                 vblwait->request.sequence);
        } else {

diff --cc drivers/gpu/drm/i915/i915_dma.c
index 18746e6cb1295ba067c9b2a4bb64ae7e9628e047,cb900dc83d950e29f99144e0d39c38102c55ce5b..8cb7f93732c2c05c1311985684141a4296358b94
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -2019,14 -2096,10 +2040,16 @@@ int i915_driver_load(struct drm_device 
        dev_priv->mchdev_lock = &mchdev_lock;
        spin_unlock(&mchdev_lock);
  
+       ips_ping_for_i915_load();
+ 
        return 0;
  
 +out_gem_unload:
 +      if (dev->pdev->msi_enabled)
 +              pci_disable_msi(dev->pdev);
 +
 +      intel_teardown_gmbus(dev);
 +      intel_teardown_mchbar(dev);
  out_workqueue_free:
        destroy_workqueue(dev_priv->wq);
  out_iomapfree:

diff --cc drivers/gpu/drm/i915/i915_reg.h
index d60860ec8cf41b36efa69a32ee42b181b0894836,cb8f434292793451225eefdbea071aefe7408e79..8f948a6fbc1c5aa031ef5199e994d3440629612f
--- 1/drivers/gpu/drm/i915/i915_reg.h
--- 2/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@@ -2698,14 -2589,17 +2701,21 @@@
  #define GTIER   0x4401c
  
  #define ILK_DISPLAY_CHICKEN2  0x42004
 +/* Required on all Ironlake and Sandybridge according to the B-Spec. */
 +#define  ILK_ELPIN_409_SELECT (1 << 25)
  #define  ILK_DPARB_GATE       (1<<22)
  #define  ILK_VSDPFD_FULL      (1<<21)
+ #define ILK_DISPLAY_CHICKEN_FUSES     0x42014
+ #define  ILK_INTERNAL_GRAPHICS_DISABLE        (1<<31)
+ #define  ILK_INTERNAL_DISPLAY_DISABLE (1<<30)
+ #define  ILK_DISPLAY_DEBUG_DISABLE    (1<<29)
+ #define  ILK_HDCP_DISABLE             (1<<25)
+ #define  ILK_eDP_A_DISABLE            (1<<24)
+ #define  ILK_DESKTOP                  (1<<23)
  #define ILK_DSPCLK_GATE               0x42020
  #define  ILK_DPARB_CLK_GATE   (1<<5)
 +#define  ILK_DPFD_CLK_GATE    (1<<7)
 +
  /* According to spec this bit 7/8/9 of 0x42020 should be set to enable FBC */
  #define   ILK_CLK_FBC         (1<<7)
  #define   ILK_DPFC_DIS1               (1<<8)

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreend.h
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fb.c
index f7b4762fa6b69109483c3b4a4e9ab0ef4de30442,6abea32be5e83b80346f5c79b0a966c66c194a7c..66324b5bb5ba0f038f393f1a4464514c41159ca9
--- 1/drivers/gpu/drm/radeon/radeon_fb.c
--- 2/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@@ -245,8 -245,10 +245,8 @@@ static int radeonfb_create(struct radeo
                goto out_unref;
        }
        info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
-       info->apertures->ranges[0].size = rdev->mc.real_vram_size;
+       info->apertures->ranges[0].size = rdev->mc.aper_size;
  
 -      info->fix.mmio_start = 0;
 -      info->fix.mmio_len = 0;
        info->pixmap.size = 64*1024;
        info->pixmap.buf_align = 8;
        info->pixmap.access_align = 32;