]> git.kernelconcepts.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jan 2013 16:46:10 +0000 (08:46 -0800)
commit3ade78817143d8c4429cf982ff21c2395a5ab01d
treeb34b8971ff4d3a01f6f16b1d21bd380abed0a7c4
parentdb44cfc70337f4f91292650e7066aa3d635d22b1
drm/radeon: avoid deadlock in pm path when waiting for fence

commit 5f8f635edd8ad5a6416bff4c5ff486500357f473 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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