Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 13 Mar 2014 07:31:01 +0000 (17:31 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 13 Mar 2014 07:31:01 +0000 (17:31 +1000)
commitbf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11
treecc76733f79df5ca9ea58526b81d6bab38fced92b
parent7aa4a0648e9bbbd1c2fd0d66db3ba6f358709445
parentb2b3d8d952e4f8d6ac2ce80be96b937f29f6e42e
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