]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7aa4a06 b2b3d8d)
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)
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


Trivial merge
Andy's Linux Kernel repo