From: Christian König Date: Mon, 20 Aug 2012 13:38:47 +0000 (+0200) Subject: drm/radeon: init lockup timeout on ring init X-Git-Tag: MMI-PSA29.97-13-9~16088^2~6^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48c0ac9911839daf188e4a0b6b132ac31050a241;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/radeon: init lockup timeout on ring init Reset the lockup timeout on ring (re-)initialisation. Otherwise we get error messages like this on gpu resets: [ 1559.949177] radeon 0000:01:00.0: GPU lockup CP stall for more than 1482270msec Signed-off-by: Christian König cc: stable@vger.kernel.org Reviewed-by: Michel Dänzer --- diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index ec79b3750430..43c431a2686d 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -706,6 +706,7 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig if (radeon_debugfs_ring_init(rdev, ring)) { DRM_ERROR("Failed to register debugfs file for rings !\n"); } + radeon_ring_lockup_update(ring); return 0; }