tree aef15c048fddc24df5f37292ed0e3d5dd1ba0a3f
parent 45ab1e07808585c645bc82afd7487a91390f5511
parent 78fe9e545ce6d510b979dc2d8e14096a279fc519
author Dave Airlie <airlied@redhat.com> 1391041496 +1000
committer Dave Airlie <airlied@redhat.com> 1391041496 +1000

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

more radeon fixes

* 'drm-next-3.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dce8: workaround for atom BlankCrtc table
  drm/radeon/DCE4+: clear bios scratch dpms bit (v2)
  drm/radeon: set si_notify_smc_display_change properly
  drm/radeon: fix DAC interrupt handling on DCE5+
  drm/radeon: clean up active vram sizing
  drm/radeon: skip async dma init on r6xx
  drm/radeon/runpm: don't runtime suspend non-PX cards
  drm/radeon: add ring to fence trace functions
  drm/radeon: add missing trace point
  drm/radeon: fix VMID use tracking