From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 Aug 2012 00:35:34 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: firefly_0821_release~3680^2~2143^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1b51124b6d3b2235d00129e2971686e6185ba52;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Alex writes:

Highlights:
- fix a gart regression on older IGP chips
- more MSAA fixes
- fix a double free in gpu reset code
- modesetting fixes
- trinity dig encoder fix.

* 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix dig encoder selection on DCE61
  drm/radeon: fix double free in radeon_gpu_reset
  drm/radeon: force dma32 to fix regression rs4xx,rs6xx,rs740
  drm/radeon: rework panel mode setup
  drm/radeon/atom: powergating fixes for DCE6
  drm/radeon/atom: rework DIG modesetting on DCE3+
  drm/radeon: don't disable plls that are in use by other crtcs
  drm/radeon: add proper checking of RESOLVE_BOX command for r600-r700
  drm/radeon: initialize tracked CS state
  drm/radeon: fix reading CB_COLORn_MASK from the CS
---

c1b51124b6d3b2235d00129e2971686e6185ba52