diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-08-20 15:38:47 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-08-20 11:09:48 -0400 |
| commit | 48c0ac9911839daf188e4a0b6b132ac31050a241 (patch) | |
| tree | 67aa23e09f161995a9e32c4ed2191d4db5b21fc1 | |
| parent | 5efcc76c13a745f98e7b6604d6aca49761be1970 (diff) | |
| download | linux-stable-48c0ac9911839daf188e4a0b6b132ac31050a241.tar.gz linux-stable-48c0ac9911839daf188e4a0b6b132ac31050a241.tar.bz2 linux-stable-48c0ac9911839daf188e4a0b6b132ac31050a241.zip | |
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 <deathsimple@vodafone.de>
cc: stable@vger.kernel.org
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |