From: Dave Airlie <airlied@redhat.com>
Date: Wed, 7 Aug 2013 23:47:02 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux
X-Git-Tag: v3.11-rc5~16^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=16d5b27250f1fab9fa1adf7b98a92e78d11cb9e2;p=~emulex%2Finfiniband.git

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

Some more radeon fixes.  Mostly dpm and uvd fixes.  Fixes hangs
with dpm on more rv6xx asics, and fixes suspend and resume with UVD.

* 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: make missing smc ucode non-fatal
  drm/radeon/dpm: require rlc for dpm
  drm/radeon/cik: use a mutex to properly lock srbm instanced registers
  drm/radeon: remove unnecessary unpin
  drm/radeon: add more UVD CS checking
  drm/radeon: stop sending invalid UVD destroy msg
  drm/radeon: only save UVD bo when we have open handles
  drm/radeon: always program the MC on startup
  drm/radeon: fix audio dto calculation on DCE3+ (v3)
  drm/radeon/dpm: disable sclk ss on rv6xx
  drm/radeon: fix halting UVD
  drm/radeon/dpm: adjust power state properly for UVD on SI
  drm/radeon/dpm: fix spread spectrum setup (v2)
  drm/radeon/dpm: adjust thermal protection requirements
  drm/radeon: select audio dto based on encoder id for DCE3
  drm/radeon: properly handle pm on gpu reset
---

16d5b27250f1fab9fa1adf7b98a92e78d11cb9e2