]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/radeon: avoid deadlock in pm path when waiting for fence
authorJerome Glisse <jglisse@redhat.com>
Mon, 17 Dec 2012 16:04:32 +0000 (11:04 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 19 Dec 2012 22:44:05 +0000 (17:44 -0500)
commit5f8f635edd8ad5a6416bff4c5ff486500357f473
tree272f2097b857340ba94a0356c4da29dc1dfcedfc
parent76903b96adbfbb38b049765add21e02e44c387a5
drm/radeon: avoid deadlock in pm path when waiting for fence

radeon_fence_wait_empty_locked should not trigger GPU reset as no
place where it's call from would benefit from such thing and it
actually lead to a kernel deadlock in case the reset is triggered
from pm codepath. Instead force ring completion in place where it
makes sense or return early in others.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/gpu/drm/radeon/radeon_pm.c