Merge branch 'drm-radeon-evergreen-accel' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:16:50 +0000 (13:16 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:16:50 +0000 (13:16 +1000)
commit153549b8b63d71a9c5d8cbde887097b995c32bd6
tree306ece7479bb98172272013dd02b243e6677a3f4
parent7fff400be6fbf64f10abca9939718aaf1d61c255
parenta7433742d62c6e0e1173bd144a4aef7724b48d60
Merge branch 'drm-radeon-evergreen-accel' into drm-core-next

* drm-radeon-evergreen-accel:
  drm/radeon: fix cypress firmware typo.
  drm/radeon/kms/evergreen: add hpd support
  drm/radeon/kms/evergreen: implement irq support
  drm/radeon/kms/evergreen: setup and enable the CP
  drm/radeon/kms/evergreen: implement gfx init
  drm/radeon/kms/evergreen: add soft reset function
  drm/radeon/kms/evergreen: add gart support
  drm/radeon/kms: add support for evergreen power tables
  drm/radeon/kms: update atombios.h power tables for evergreen
drivers/gpu/drm/radeon/atombios_crtc.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/rv770.c