Merge branch 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux into drm-next

Browse source

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

...

This commit is contained in:

Dave Airlie 2013-05-21 09:42:55 +10:00

parent a3f6902672 2a0f90551a

commit cc3e06a57d

9 changed files with 362 additions and 92 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

27

drivers/gpu/drm/radeon/evergreen.c

View file

2

drivers/gpu/drm/radeon/radeon.h

View file

22

drivers/gpu/drm/radeon/radeon_asic.c

View file

28

drivers/gpu/drm/radeon/radeon_bios.c

View file

1

drivers/gpu/drm/radeon/radeon_device.c

View file

1

drivers/gpu/drm/radeon/radeon_family.h

View file

366

drivers/gpu/drm/radeon/si.c

View file

1

drivers/gpu/drm/radeon/sid.h

View file

6

include/drm/drm_pciids.h

View file