From: Dave Airlie <airlied@redhat.com>
Date: Tue, 21 Aug 2012 23:18:49 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2be2cd8046748a006c4afa40959855fe4079274;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

Alex writes:

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

Highlights:
- fix vbios fetch on pure uefi systems
- fix vbios fetch on thunderbolt systems
- MSAA fixes
- lockup timeout fix
- modesetting fix"

* 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/ss: use num_crtc rather than hardcoded 6
  Revert "drm/radeon: fix bo creation retry path"
  drm/radeon: split ATRM support out from the ATPX handler (v3)
  drm/radeon: convert radeon vfct code to use acpi_get_table_with_size
  ACPI: export symbol acpi_get_table_with_size
  drm/radeon: implement ACPI VFCT vbios fetch (v3)
  drm/radeon/kms: extend the Fujitsu D3003-S2 board connector quirk to cover later silicon stepping
  drm/radeon: fix checking of MSAA renderbuffers on r600-r700
  drm/radeon: allow CMASK and FMASK in the CS checker on r600-r700
  drm/radeon: init lockup timeout on ring init
  drm/radeon: avoid turning off spread spectrum for used pll
---

e2be2cd8046748a006c4afa40959855fe4079274