diff options
author | Dave Airlie <airlied@redhat.com> | 2013-05-03 02:09:11 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-05-03 02:09:11 +0200 |
commit | 6110948846e9440a60e491a9be67a8a13c646b7e (patch) | |
tree | 4fc4f362b6f52aaf748a96830a42a3a7cdcab129 /drivers/video | |
parent | drm/nouveau: fix build with nv50->nvc0 (diff) | |
parent | drm/radeon: fix handling of v6 power tables (diff) | |
download | linux-6110948846e9440a60e491a9be67a8a13c646b7e.tar.xz linux-6110948846e9440a60e491a9be67a8a13c646b7e.zip |
Merge branch 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux into drm-next
Just some fixes that have accumulated over the last couple of
weeks and some new PCI ids.
* 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: fix handling of v6 power tables
drm/radeon: clarify family checks in pm table parsing
drm/radeon: consolidate UVD clock programming
drm/radeon: fix UPLL_REF_DIV_MASK definition
radeon: add bo tracking debugfs
drm/radeon: add new richland pci ids
drm/radeon: add some new SI PCI ids
drm/radeon: fix scratch reg handling for UVD fence
drm/radeon: allocate SA bo in the requested domain
drm/radeon: fix possible segfault when parsing pm tables
drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions