Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next

* 'intel/drm-intel-next' of /ssd/git/drm-next: (771 commits)
  drm/i915: Undo "Uncouple render/power ctx before suspending"
  drm/i915: Allow the application to choose the constant addressing mode
  drm/i915: dynamic render p-state support for Sandy Bridge
  drm/i915: Enable EI mode for RCx decision making on Sandybridge
  drm/i915/sdvo: Border and stall select became test bits in gen5
  drm/i915: Add Guess-o-matic for pageflip timestamping.
  drm/i915: Add support for precise vblank timestamping (v2)
  drm/i915: Add frame buffer compression on Sandybridge
  drm/i915: Add self-refresh support on Sandybridge
  drm/i915: Wait for vblank before unpinning old fb
  Revert "drm/i915: Avoid using PIPE_CONTROL on Ironlake"
  drm/i915: Pass clock limits down to PLL matcher
  drm/i915: Poll for seqno completion if IRQ is disabled
  drm/i915/ringbuffer: Make IRQ refcnting atomic
  agp/intel: Fix missed cached memory flags setting in i965_write_entry()
  drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
  drm/i915: Enable RC6 autodownclocking on Sandybridge
  drm/i915: Terminate the FORCE WAKE after we have finished reading
  drm/i915/gtt: Clear the cachelines upon resume
  drm/i915: Restore GTT mapping first upon resume
  ...

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

diff --cc drivers/gpu/drm/i915/intel_fb.c
index ced3eef8da071496d054982348bb326f166ff37f,c2cffeb4fe89799c6c5f83f474bbf5be7992a049..67738f32dfd48ede04915b864d297fb33897d311
--- 1/drivers/gpu/drm/i915/intel_fb.c
--- 2/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -65,10 -65,9 +65,9 @@@ static int intelfb_create(struct intel_
        struct fb_info *info;
        struct drm_framebuffer *fb;
        struct drm_mode_fb_cmd mode_cmd;
-       struct drm_gem_object *fbo = NULL;
-       struct drm_i915_gem_object *obj_priv;
+       struct drm_i915_gem_object *obj;
        struct device *device = &dev->pdev->dev;
 -      int size, ret, mmio_bar = IS_GEN2(dev) ? 1 : 0;
 +      int size, ret;
  
        /* we don't do packed 24bpp */
        if (sizes->surface_bpp == 24)

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

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

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

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