From: Dave Airlie Date: Fri, 11 Oct 2013 03:07:15 +0000 (+1000) Subject: Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Tag: v3.12-rc5~14^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2302628550ad97ce3281124343816b141da22887;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Regression fixes for audio and UVD, several hang fixes, some DPM fixes. * 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: re-enable sw ACR support on pre-DCE4 drm/radeon/dpm: disable bapm on TN asics drm/radeon: improve soft reset on CIK drm/radeon: improve soft reset on SI drm/radeon/dpm: off by one in si_set_mc_special_registers() drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers() drm/radeon: forever loop on error in radeon_do_test_moves() drm/radeon: fix hw contexts for SUMO2 asics drm/radeon: fix typo in CP DMA register headers drm/radeon/dpm: disable multiple UVD states drm/radeon: use hw generated CTS/N values for audio drm/radeon: fix N/CTS clock matching for audio drm/radeon: use 64-bit math to calculate CTS values for audio (v2) drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation --- 2302628550ad97ce3281124343816b141da22887