Merge branch 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux into drm-next
This is the pull request for AMD Sun/Hainan support. I've split it out separately from my regular fixes stream. Hainan is a new SI asic with no UVD or DCE hardware. The patches are minimally invasive; basically just pci ids and skipping UVD and DCE init for this family. Most of the changes to si.c are just the golden register tables for the family. * 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: add Hainan pci ids drm/radeon: add golden register settings for Hainan (v2) drm/radeon: sun/hainan chips do not have UVD (v2) drm/radeon: track which asics have UVD drm/radeon: radeon-asic updates for Hainan drm/radeon: fill in ucode loading support for Hainan drm/radeon: don't touch DCE or VGA regs on Hainan (v3) drm/radeon: fill in GPU init for Hainan (v2) drm/radeon: add chip family for Hainan
Showing
- drivers/gpu/drm/radeon/evergreen.c 17 additions, 10 deletionsdrivers/gpu/drm/radeon/evergreen.c
- drivers/gpu/drm/radeon/radeon.h 2 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_asic.c 21 additions, 1 deletiondrivers/gpu/drm/radeon/radeon_asic.c
- drivers/gpu/drm/radeon/radeon_bios.c 16 additions, 12 deletionsdrivers/gpu/drm/radeon/radeon_bios.c
- drivers/gpu/drm/radeon/radeon_device.c 1 addition, 0 deletionsdrivers/gpu/drm/radeon/radeon_device.c
- drivers/gpu/drm/radeon/radeon_family.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/radeon_family.h
- drivers/gpu/drm/radeon/si.c 297 additions, 69 deletionsdrivers/gpu/drm/radeon/si.c
- drivers/gpu/drm/radeon/sid.h 1 addition, 0 deletionsdrivers/gpu/drm/radeon/sid.h
- include/drm/drm_pciids.h 6 additions, 0 deletionsinclude/drm/drm_pciids.h
Loading
Please register or sign in to comment