On Mon, 2012-08-20 at 15:38 +0200, Christian König wrote: > 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@xxxxxxxxxxx> > cc: stable@xxxxxxxxxx > --- > drivers/gpu/drm/radeon/radeon_ring.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c > index ec79b37..43c431a 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; > } Reviewed-by: Michel Dänzer <michel.daenzer@xxxxxxx> -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel