| commit | bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Mar 13 17:31:01 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Mar 13 17:31:01 2014 +1000 |
| tree | cc76733f79df5ca9ea58526b81d6bab38fced92b | |
| parent | 7aa4a0648e9bbbd1c2fd0d66db3ba6f358709445 [diff] | |
| parent | b2b3d8d952e4f8d6ac2ce80be96b937f29f6e42e [diff] |
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