projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
07ae78c
)
drm/radeon/cik: properly set compute ring status on disable
author
Alex Deucher
<alexander.deucher@amd.com>
Wed, 12 Mar 2014 20:20:44 +0000
(16:20 -0400)
committer
Alex Deucher
<alexander.deucher@amd.com>
Wed, 12 Mar 2014 20:20:44 +0000
(16:20 -0400)
When we disable the rings, set the status properly. If
not other code pathes may try and use the rings which are
not functional at this point.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/cik.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/cik.c
b/drivers/gpu/drm/radeon/cik.c
index
e22be84
..
bbb1784
100644
(file)
--- 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);
}