diff options
author | Dave Airlie <airlied@redhat.com> | 2011-01-10 09:27:06 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-01-10 09:27:06 +1000 |
commit | c3307cd6a7ca91c257795c5275e887a3eafb6880 (patch) | |
tree | e4ddaa114644f16ef44026c3f4e5376e90e9c25c /drivers/mca | |
parent | 0ba41e449fd0f45f5b29c1009020ab1b298bedda (diff) | |
parent | 187f3da3d98a1740d71e1f5d4fb3c68df09ecca8 (diff) | |
download | linux-3.10-c3307cd6a7ca91c257795c5275e887a3eafb6880.tar.gz linux-3.10-c3307cd6a7ca91c257795c5275e887a3eafb6880.tar.bz2 linux-3.10-c3307cd6a7ca91c257795c5275e887a3eafb6880.zip |
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
...
Diffstat (limited to 'drivers/mca')
0 files changed, 0 insertions, 0 deletions