From 3256d75475a754ab5e290eb2f8426f08f4328f4c Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 20 Nov 2012 22:31:06 +0100 Subject: [PATCH] --- yaml --- r: 343039 b: refs/heads/master c: 501f9d4c1d5cb524e7c2be1203b5edc4a8edf593 h: refs/heads/master i: 343037: 9a0f64c76b412191ad653e04b91b1fc594f44089 343035: a8895093ed8ea5956209f73bbdbf8974882f9ba8 343031: 35ee8d10e2dffb54011f4c10f49f417862e84e34 343023: 579ad385d81a84f53cb4b5541cb22a142d828d69 343007: 3f121f2459fdaf2e12f925e208c56b58fd849ffb 342975: 2e16b64eb46647b99eb25992c40140c4b407e3b8 342911: 8a6ae54c68998c210ff23babcb9cf1cb00374c55 342783: fcefb456e5fd217b746965f90ff5f7d9b137d2c5 342527: 90b738781ef04affef4f62306d8f998d72cd3cca 342015: d27ce33b6962658a80a9161d58b87cc34fcec5e5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20a82f22a70f..cf9fded3c6df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 801b295e4fd4a8c3344fcf523a12ef5ac41de889 +refs/heads/master: 501f9d4c1d5cb524e7c2be1203b5edc4a8edf593 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_ring.c b/trunk/drivers/gpu/drm/radeon/radeon_ring.c index 47634f27f2e5..ebd69562ef6c 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_ring.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_ring.c @@ -459,7 +459,7 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *r * * @ring: radeon_ring structure holding ring information * - * Reset the driver's copy of the wtpr (all asics). + * Reset the driver's copy of the wptr (all asics). */ void radeon_ring_undo(struct radeon_ring *ring) { @@ -503,7 +503,7 @@ void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring * } /** - * radeon_ring_force_activity - update lockup variables + * radeon_ring_lockup_update - update lockup variables * * @ring: radeon_ring structure holding ring information *