Merge remote branch 'korg/drm-radeon-cayman' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Thu, 3 Mar 2011 02:00:52 +0000 (12:00 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 3 Mar 2011 02:00:52 +0000 (12:00 +1000)
commitba77a26cb570f8b506bcb7991b1e154b8bd38914
tree5491e3ed0b5cf407cf1b28e4d7af862cde8735fe
parent486af1896f3a4a388410215c5a2014b9d09a79f5
parent64bc5524906e31c1144af29ba50c585afe333bb3
Merge remote branch 'korg/drm-radeon-cayman' into drm-core-next

* korg/drm-radeon-cayman:
  drm/radeon/kms: add cayman pci ids
  drm/radeon/kms: cayman/evergreen cs checker updates
  drm/radeon/kms/cayman: always set certain VGT regs at CP init
  drm/radeon/kms: additional default context regs for cayman
  drm/radeon/kms: add cayman CS check support
  drm/radeon/kms: add radeon_asic entry for cayman
  drm/radeon/kms: add cayman safe regs
  drm/radeon/kms/cayman: add asic init/startup/fini/suspend/resume functions
  drm/radeon/kms: add cayman asic reset support
  drm/radeon/kms: add support for cayman irqs
  drm/radeon/kms: add support for CP setup on cayman asics
  drm/radeon/kms: add support for cayman gart setup
  drm/radeon/kms: add gpu_init function for cayman
  drm/radeon/kms: add ucode loader for cayman
  drm/radeon/kms: add cayman chip family