From: Dave Airlie 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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