From: Dave Airlie <airlied@redhat.com>
Date: Thu, 13 Mar 2014 07:31:01 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v3.14-rc7~8^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11;p=karo-tx-linux.git

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

A few more radeon fixes.

* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/cik: properly set compute ring status on disable
  drm/radeon/cik: stop the sdma engines in the enable() function
  drm/radeon/cik: properly set sdma ring status on disable
  drm/radeon: fix runpm disabling on non-PX harder
---

bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11