diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 10:53:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 10:53:26 -0700 |
| commit | f80c43efb3f568acc1ff12731ecf2b4da4b2fe5c (patch) | |
| tree | ff1523359cbb2b97d23dc874734fbff2ca31469c /drivers/gpu/drm/radeon/atombios_i2c.c | |
| parent | fffaee365fded09f9ebf2db19066065fa54323c3 (diff) | |
| parent | 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm radeon fixes from Dave Airlie:
"This is just radeon fixes and a bunch of new PCI ids. The fixes are
for a deadlock, an audio regression, and a couple of audio fixes."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon/kms: add new SI PCI ids
drm/radeon/kms: add new BTC PCI ids
drm/radeon/kms: add new Palm, Sumo PCI ids
drm/radeon/kms: add new Trinity PCI ids
drm/radeon: fix vm deadlocks on cayman
drm/radeon: fix gpu_init on si
drm/radeon/hdmi: don't set SEND_MAX_PACKETS bit
drm/radeon/audio: don't hardcode CRTC id
drm/radeon: make audio_init consistent across asics
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_i2c.c')
0 files changed, 0 insertions, 0 deletions