From: Dave Airlie <airlied@redhat.com>
Date: Sun, 9 Jan 2011 23:27:06 +0000 (+1000)
Subject: Merge branch 'drm-radeon-ni' of ../drm-radeon-next into drm-core-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c3307cd6a7ca91c257795c5275e887a3eafb6880;p=mv-sheeva.git

Merge branch 'drm-radeon-ni' of ../drm-radeon-next into drm-core-next

* 'drm-radeon-ni' of ../drm-radeon-next: (30 commits)
  radeon: consolidate asic-specific function decls for pre-r600
  drm/radeon/kms: add NI pci ids
  drm/radeon/kms: don't enable pcie gen2 on NI yet
  drm/radeon/kms: add radeon_asic struct for NI asics
  drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init
  drm/radeon/kms: add ucode loader for NI
  drm/radeon/kms: add support for DCE5 display LUTs
  drm/radeon/kms: add ni_reg.h
  drm/radeon/kms: add bo blit support for NI
  drm/radeon/kms: always use writeback/events for fences on NI
  drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5
  drm/radeon/kms: add backend map workaround for barts
  drm/radeon/kms: fill gpu init for NI asics
  drm/radeon/kms: add disabled vbios accessor for NI asics
  drm/radeon/kms: handle NI thermal controller
  drm/radeon/kms: parse DCE5 encoder caps when setting up encoders
  drm/radeon/kms: dvo dpms updates for DCE5
  drm/radeon/kms: dac dpms updates for DCE5
  drm/radeon/kms: DCE5 atom dig encoder updates
  drm/radeon/kms: DCE5 atom transmitter control updates
  ...
---

c3307cd6a7ca91c257795c5275e887a3eafb6880