I just pushed one more important fix:

commit 41fa54377057ab38bc3e08ebb46168a7daf2e63b Author: Alex Deucher alexander.deucher@amd.com Date: Wed Aug 29 19:48:26 2012 -0400

drm/radeon: fix dig encoder selection on DCE61

Was using the DCE41 code which was wrong. Fixes blank displays on a number of Trinity systems.

Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org

If it's not too late, please make sure this one is included.

On Wed, Aug 29, 2012 at 1:32 PM, alexdeucher@gmail.com wrote:

From: Alex Deucher alexander.deucher@amd.com

Hi Dave,

This is the current set of radeon fixes for 3.6. Nothing too major.

Highlights:

• fix a gart regression on older IGP chips
• more MSAA fixes
• fix a double free in gpu reset code
• modesetting fixes

The following changes since commit 84f720ecba6716d198b21936d1bf6253e8ab42a1:

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2012-08-29 20:09:23 +1000)

are available in the git repository at:

git://people.freedesktop.org/~agd5f/linux drm-fixes-3.6

Alex Deucher (4): drm/radeon: don't disable plls that are in use by other crtcs drm/radeon/atom: rework DIG modesetting on DCE3+ drm/radeon/atom: powergating fixes for DCE6 drm/radeon: rework panel mode setup

Christian König (1): drm/radeon: fix double free in radeon_gpu_reset

Jerome Glisse (1): drm/radeon: force dma32 to fix regression rs4xx,rs6xx,rs740

Marek Olšák (3): drm/radeon: fix reading CB_COLORn_MASK from the CS drm/radeon: initialize tracked CS state drm/radeon: add proper checking of RESOLVE_BOX command for r600-r700

drivers/gpu/drm/radeon/atombios_crtc.c | 36 ++++----- drivers/gpu/drm/radeon/atombios_dp.c | 29 +++----- drivers/gpu/drm/radeon/atombios_encoders.c | 109 ++++++++++++---------------- drivers/gpu/drm/radeon/r600_cs.c | 30 +++++++- drivers/gpu/drm/radeon/r600d.h | 8 ++ drivers/gpu/drm/radeon/radeon_device.c | 5 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/reg_srcs/r600 | 1 - 8 files changed, 115 insertions(+), 106 deletions(-)