Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205011
b: refs/heads/master
c: 9bd7ef5
h: refs/heads/master
i:
  205009: 8e47e83
  205007: 17f8fac
v: v3
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Aug 1, 2010
1 parent eb5c12e commit 180d145
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ce9198ecf73739104b274c7c6377ef3659b3ca5
refs/heads/master: 9bd7ef5f5a5ab6088029ad95a435f03e1314275d
4 changes: 2 additions & 2 deletions trunk/drivers/gpu/drm/radeon/atom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 180d145

Please sign in to comment.