From: Dave Airlie <airlied@redhat.com>
Date: Mon, 13 Aug 2012 23:25:01 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v3.6~211^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bac6b46607f2f44075cb45dd5b0b4d2e7c80695;p=platform%2Fkernel%2Flinux-amlogic.git

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

Alex Deucher writes:
This is the current set of radeon fixes for 3.6.  Nothing too major.

Highlights:
- various display fixes
- some SI fixes
- new SI pci ids
- major VM fix
- CS checker support for MSAA

I've tested on a number of cards across generations and noticed no problems.

* 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix typo in function header comment
  drm/radeon/kms: implement timestamp userspace query (v2)
  drm/radeon/kms: add MSAA texture support for r600-evergreen
  drm/radeon/kms: reorder code in r600_check_texture_resource
  drm/radeon: fence virtual address and free it once idle v4
  drm/radeon: fix some missing parens in asic macros
  drm/radeon: add some new SI pci ids
  drm/radeon: fix ordering in pll picking on dce4+
  drm/radeon: do not reenable crtc after moving vram start address
  drm/radeon: fix bank tiling parameters on cayman
  drm/radeon: fix bank tiling parameters on evergreen
  drm/radeon: fix bank tiling parameters on SI
  drm/radeon: properly handle crtc powergating
  drm/radeon: properly handle SS overrides on TN (v2)
  drm/radeon/dce4+: set a more reasonable cursor watermark
  drm/radeon: fix handling for ddc type 5 on combios
---

7bac6b46607f2f44075cb45dd5b0b4d2e7c80695