projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14' into drm-intel-next-queued
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
si_dma.c
diff --git
a/drivers/gpu/drm/radeon/si_dma.c
b/drivers/gpu/drm/radeon/si_dma.c
index c75f5337f46287044c63a85f299f63a9c7bf1af6..cf0fdad8c278ef6921bbab3677c2cd596bcf1575 100644
(file)
--- a/
drivers/gpu/drm/radeon/si_dma.c
+++ b/
drivers/gpu/drm/radeon/si_dma.c
@@
-52,8
+52,6
@@
bool si_dma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
radeon_ring_lockup_update(rdev, ring);
return false;
}
- /* force ring activities */
- radeon_ring_force_activity(rdev, ring);
return radeon_ring_test_lockup(rdev, ring);
}
This page took
0.035979 seconds
and
5
git commands to generate.