From: Alex Deucher alexander.deucher@amd.com

Hi Dave,

Just some fixes that have accumulated over the last couple of weeks and some new PCI ids.

The following changes since commit f468400664e3ae79e6e001bb2820c79bebe6aa41:

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next (2013-05-02 17:33:25 +1000)

are available in the git repository at:

git://people.freedesktop.org/~agd5f/linux drm-next-3.10-2

Alex Deucher (6): drm/radeon: fix endian bugs in atom_allocate_fb_scratch() drm/radeon: fix possible segfault when parsing pm tables drm/radeon: add some new SI PCI ids drm/radeon: add new richland pci ids drm/radeon: clarify family checks in pm table parsing drm/radeon: fix handling of v6 power tables

Christian König (4): drm/radeon: allocate SA bo in the requested domain drm/radeon: fix scratch reg handling for UVD fence drm/radeon: fix UPLL_REF_DIV_MASK definition drm/radeon: consolidate UVD clock programming

Jerome Glisse (1): radeon: add bo tracking debugfs

drivers/gpu/drm/radeon/atom.c | 6 +- drivers/gpu/drm/radeon/evergreen.c | 103 +++-------------------- drivers/gpu/drm/radeon/evergreend.h | 2 +- drivers/gpu/drm/radeon/ni.c | 6 +- drivers/gpu/drm/radeon/r600d.h | 4 + drivers/gpu/drm/radeon/radeon.h | 16 +++- drivers/gpu/drm/radeon/radeon_atombios.c | 27 ++++-- drivers/gpu/drm/radeon/radeon_device.c | 5 + drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 50 +++++++++++ drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 137 ++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/rv770.c | 110 ++++-------------------- drivers/gpu/drm/radeon/rv770d.h | 2 +- drivers/gpu/drm/radeon/si.c | 104 +++-------------------- drivers/gpu/drm/radeon/sid.h | 2 +- include/drm/drm_pciids.h | 5 + 17 files changed, 284 insertions(+), 299 deletions(-)