]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/radeon: rework recursive gpu reset handling
authorChristian König <deathsimple@vodafone.de>
Wed, 2 May 2012 13:11:19 +0000 (15:11 +0200)
committerDave Airlie <airlied@redhat.com>
Thu, 3 May 2012 08:16:31 +0000 (09:16 +0100)
commit6c6f478370eccfbfafbdc6fc55c0def03e58f124
tree3fee8223bea4d761b50a146e8b55c666e81ab9e1
parent8f676c4c6f0f500616560f13c0276ab6b4e39a6a
drm/radeon: rework recursive gpu reset handling

Instead of all this humpy pumpy with recursive
mutex (which also fixes only halve of the problem)
move the actual gpu reset out of the fence code,
return -EDEADLK and then reset the gpu in the
calling ioctl function.

v2: Split removal of radeon_mutex into separate patch.
    Return -EAGAIN if reset is successful.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/gpu/drm/radeon/radeon_gem.c