From c0d36f1759f4c79f8ec681a307bf2ea16282e4d4 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Fri, 21 Oct 2011 12:51:02 -0400 Subject: [PATCH] --- yaml --- r: 269782 b: refs/heads/master c: 19703058cd2eacd83ed5948fdbbc5e29d94b60b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0e137f4c3348..ab8edadf1285 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd2351da7c438eb3d5f64a161cf3483648725dcd +refs/heads/master: 19703058cd2eacd83ed5948fdbbc5e29d94b60b5 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_fence.c b/trunk/drivers/gpu/drm/radeon/radeon_fence.c index 7fd4e3e5ad5f..a488b502ec1f 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_fence.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_fence.c @@ -263,7 +263,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) */ if (seq == rdev->fence_drv.last_seq && radeon_gpu_is_lockup(rdev)) { /* good news we believe it's a lockup */ - WARN(1, "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", + printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", fence->seq, seq); /* FIXME: what should we do ? marking everyone * as signaled for now