diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-13 17:31:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-13 17:31:01 +1000 |
| commit | bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11 (patch) | |
| tree | cc76733f79df5ca9ea58526b81d6bab38fced92b /drivers/gpu/drm/radeon/cik.c | |
| parent | Merge tag 'vmwgfx-fixes-3.14-2014-03-13' of git://people.freedesktop.org/~thomash/linux into drm-fixes (diff) | |
| parent | drm/radeon/cik: properly set compute ring status on disable (diff) | |
| download | linux-dev-bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11.tar.xz linux-dev-bf21d605bf7d18d2b3cdb1c19fc1b2a1549c1f11.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index e22be8458d92..bbb17841a9e5 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -4134,8 +4134,11 @@ static void cik_cp_compute_enable(struct radeon_device *rdev, bool enable) { if (enable) WREG32(CP_MEC_CNTL, 0); - else + else { WREG32(CP_MEC_CNTL, (MEC_ME1_HALT | MEC_ME2_HALT)); + rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false; + rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false; + } udelay(50); } |