Merge remote branch 'korg/drm-radeon-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Mon, 25 Jan 2010 06:04:21 +0000 (16:04 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 25 Jan 2010 06:04:21 +0000 (16:04 +1000)
commit9299795c6e1e11b2d1e6f53a03902dc80cfb3320
treeabfda0d16d1c8239e2be8294a8e5c02190d9384a
parent8d586fe65a33b1a3a2a2539119248ce12f4bab50
parent38678d3557420a1c40f7ad5a04a46a7de7a305b9
Merge remote branch 'korg/drm-radeon-next' into drm-linus

* korg/drm-radeon-next:
  drm/radeon/kms: fix legacy get_engine/memory clock
  drm/radeon/kms/atom: atom parser fixes
  drm/radeon/kms: clean up atombios pll code
  drm/radeon/kms: clean up pll struct
  drm/radeon/kms/atom: fix crtc lock ordering
  drm/radeon: r6xx/r7xx possible security issue, system ram access
  drm/radeon/kms: r600/r700 don't test ib if ib initialization fails
  drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object
  drm/radeon/kms: r600 handle irq vector ring overflow
  drm/radeon/kms: r600/r700 don't process IRQ if not initialized
  drm/radeon/kms: r600/r700 disable irq at suspend
  drm/radeon/kms/r4xx: cleanup atom path
  drm/radeon/kms: fix atombios_crtc_set_base
  drm/radeon/kms/atom: upstream parser updates
  drm/radeon/kms/atom: fix some parser bugs
  drm/radeon/kms: fix hardcoded mmio size in register functions
  drm/radeon/kms/r100: fix bug in CS parser
  drm/radeon/kms/r200: fix bug in CS parser
  drm/radeon/kms/r200: fix bug in CS parser