aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/atom.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-06-30 14:58:59 -0400
committerDave Airlie <airlied@redhat.com>2010-08-02 09:59:58 +1000
commit9bd7ef5f5a5ab6088029ad95a435f03e1314275d (patch)
treef10d82763da6ac37edcb49f848475539858378f8 /drivers/gpu/drm/radeon/atom.c
parent4ce9198ecf73739104b274c7c6377ef3659b3ca5 (diff)
downloadmrst-s0i3-test-9bd7ef5f5a5ab6088029ad95a435f03e1314275d.tar.gz
mrst-s0i3-test-9bd7ef5f5a5ab6088029ad95a435f03e1314275d.tar.xz
mrst-s0i3-test-9bd7ef5f5a5ab6088029ad95a435f03e1314275d.zip
drm/radeon/kms/atom: bump atom loop timeout from 1 sec to 5 secs
Some tables have delays that can cause the timeout to hit even when not intended. Should fix: https://bugs.freedesktop.org/show_bug.cgi?id=27744 and related bugs. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/atom.c')
-rw-r--r--drivers/gpu/drm/radeon/atom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 1d569830ed9..bded8704326 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -715,8 +715,8 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg)
cjiffies = jiffies;
if (time_after(cjiffies, ctx->last_jump_jiffies)) {
cjiffies -= ctx->last_jump_jiffies;
- if ((jiffies_to_msecs(cjiffies) > 1000)) {
- DRM_ERROR("atombios stuck in loop for more than 1sec aborting\n");
+ if ((jiffies_to_msecs(cjiffies) > 5000)) {
+ DRM_ERROR("atombios stuck in loop for more than 5secs aborting\n");
ctx->abort = true;
}
} else {