diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-05-02 15:11:21 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 09:16:35 +0100 |
| commit | 3368ff0cf483005bd327372049f2bf43dc63730a (patch) | |
| tree | 7ae68a4041144aa665cfbb17c21a71f74e825ec4 /drivers/gpu/drm/radeon/radeon_ring.c | |
| parent | 069211e55561fdaf86d66eedacca57eaad910757 (diff) | |
| download | kernel_goldelico_gta04-3368ff0cf483005bd327372049f2bf43dc63730a.zip kernel_goldelico_gta04-3368ff0cf483005bd327372049f2bf43dc63730a.tar.gz kernel_goldelico_gta04-3368ff0cf483005bd327372049f2bf43dc63730a.tar.bz2 | |
drm/radeon: make lockup timeout a module param
Don't hard code the 10 seconds timeout. Compute jobs
can run much longer.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 203ec1f6..08e1578 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -441,7 +441,7 @@ bool radeon_ring_test_lockup(struct radeon_device *rdev, struct radeon_ring *rin return false; } elapsed = jiffies_to_msecs(cjiffies - ring->last_activity); - if (elapsed >= 10000) { + if (radeon_lockup_timeout && elapsed >= radeon_lockup_timeout) { dev_err(rdev->dev, "GPU lockup CP stall for more than %lumsec\n", elapsed); return true; } |