Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "Okay this is the big one, I was stalled on the fbdev pull req as I
  stupidly let fbdev guys merge a patch I required to fix a warning with
  some patches I had, they ended up merging the patch from the wrong
  place, but the warning should be fixed.  In future I'll just take the
  patch myself!

  Outside drm:

  There are some snd changes for the HDMI audio interactions on haswell,
  they've been acked for inclusion via my tree.  This relies on the
  wound/wait tree from Ingo which is already merged.

  Major changes:

  AMD finally released the dynamic power management code for all their
  GPUs from r600->present day, this is great, off by default for now but
  also a huge amount of code, in fact it is most of this pull request.

  Since it landed there has been a lot of community testing and Alex has
  sent a lot of fixes for any bugs found so far.  I suspect radeon might
  now be the biggest kernel driver ever :-P p.s.  radeon.dpm=1 to enable
  dynamic powermanagement for anyone.

  New drivers:

  Renesas r-car display unit.

  Other highlights:

   - core: GEM CMA prime support, use new w/w mutexs for TTM
     reservations, cursor hotspot, doc updates
   - dvo chips: chrontel 7010B support
   - i915: Haswell (fbc, ips, vecs, watermarks, audio powerwell),
     Valleyview (enabled by default, rc6), lots of pll reworking, 30bpp
     support (this time for sure)
   - nouveau: async buffer object deletion, context/register init
     updates, kernel vp2 engine support, GF117 support, GK110 accel
     support (with external nvidia ucode), context cleanups.
   - exynos: memory leak fixes, Add S3C64XX SoC series support, device
     tree updates, common clock framework support,
   - qxl: cursor hotspot support, multi-monitor support, suspend/resume
     support
   - mgag200: hw cursor support, g200 mode limiting
   - shmobile: prime support
   - tegra: fixes mostly

  I've been banging on this quite a lot due to the size of it, and it
  seems to okay on everything I've tested it on."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (811 commits)
  drm/radeon/dpm: implement vblank_too_short callback for si
  drm/radeon/dpm: implement vblank_too_short callback for cayman
  drm/radeon/dpm: implement vblank_too_short callback for btc
  drm/radeon/dpm: implement vblank_too_short callback for evergreen
  drm/radeon/dpm: implement vblank_too_short callback for 7xx
  drm/radeon/dpm: add checks against vblank time
  drm/radeon/dpm: add helper to calculate vblank time
  drm/radeon: remove stray line in old pm code
  drm/radeon/dpm: fix display_gap programming on rv7xx
  drm/nvc0/gr: fix gpc firmware regression
  drm/nouveau: fix minor thinko causing bo moves to not be async on kepler
  drm/radeon/dpm: implement force performance level for TN
  drm/radeon/dpm: implement force performance level for ON/LN
  drm/radeon/dpm: implement force performance level for SI
  drm/radeon/dpm: implement force performance level for cayman
  drm/radeon/dpm: implement force performance levels for 7xx/eg/btc
  drm/radeon/dpm: add infrastructure to force performance levels
  drm/radeon: fix surface setup on r1xx
  drm/radeon: add support for 3d perf states on older asics
  drm/radeon: set default clocks for SI when DPM is disabled
  ...

diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge

diff --cc Documentation/DocBook/drm.tmpl
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
Simple merge

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/main.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

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

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

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

diff --cc drivers/gpu/drm/omapdrm/omap_crtc.c
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_ioctl.c
Simple merge

diff --cc drivers/staging/imx-drm/ipuv3-crtc.c
Simple merge

diff --cc drivers/video/of_display_timing.c
index 9c0f17b2e6fb59309449e5a62b99925c23d511da,2894e0300a33fb8676a7ca8f12b913b5b99ad76b..171821ddd78de381a866e9912bece023a8fcaca5
--- 1/drivers/video/of_display_timing.c
--- 2/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@@ -53,12 -53,13 +53,12 @@@ static int parse_timing_property(const 
  }
  
  /**
 - * of_get_display_timing - parse display_timing entry from device_node
 + * of_parse_display_timing - parse display_timing entry from device_node
   * @np: device_node with the properties
   **/
- static int of_parse_display_timing(struct device_node *np,
 -static struct display_timing *of_get_display_timing(const struct device_node
 -                                                  *np)
++static int of_parse_display_timing(const struct device_node *np,
 +              struct display_timing *dt)
  {
 -      struct display_timing *dt;
        u32 val = 0;
        int ret = 0;
  

diff --cc drivers/video/uvesafb.c
Simple merge

diff --cc sound/pci/hda/Kconfig
Simple merge

diff --cc sound/pci/hda/hda_intel.c
index f39de9055097979f93efa3a05a630b8ffa945107,35e9f8b010a7555e89cd3bac9b70113c795435e0..8860dd529520d0335264af050fdb918ae47c1c60
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -2962,8 -2953,9 +2972,10 @@@ static int azx_runtime_suspend(struct d
        struct azx *chip = card->private_data;
  
        azx_stop_chip(chip);
 +      azx_enter_link_reset(chip);
        azx_clear_irq_pending(chip);
+       if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
+               hda_display_power(false);
        return 0;
  }
  
@@@ -3848,11 -3882,9 +3901,8 @@@ static void azx_remove(struct pci_dev *
  {
        struct snd_card *card = pci_get_drvdata(pci);
  
-       if (pci_dev_run_wake(pci))
-               pm_runtime_get_noresume(&pci->dev);
- 
        if (card)
                snd_card_free(card);
 -      pci_set_drvdata(pci, NULL);
  }
  
  /* PCI IDs */