projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
cik.c
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);
}