aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/ttm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-10-18 19:48:34 -0400
committerDave Airlie <airlied@redhat.com>2010-10-18 19:48:34 -0400
commitb7ae5056c94a8191c1fd0b5697707377516c0c5d (patch)
tree394f68003ea0bc2a0c24e510a7c5b13f479ce743 /include/drm/ttm
parent2126d0a4a205e2d6b763434f892524cd60f74228 (diff)
parent6a2a11dbea5db417d200d38dda53c30a2e5603e0 (diff)
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts: drivers/gpu/drm/i915/intel_fb.c drivers/gpu/drm/radeon/r600_blit_kms.c drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'include/drm/ttm')
-rw-r--r--include/drm/ttm/ttm_bo_api.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 49b43c23636a..5afa5b52063e 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -247,9 +247,11 @@ struct ttm_buffer_object {
247 247
248 atomic_t reserved; 248 atomic_t reserved;
249 249
250
251 /** 250 /**
252 * Members protected by the bo::lock 251 * Members protected by the bo::lock
252 * In addition, setting sync_obj to anything else
253 * than NULL requires bo::reserved to be held. This allows for
254 * checking NULL while reserved but not holding bo::lock.
253 */ 255 */
254 256
255 void *sync_obj_arg; 257 void *sync_obj_arg;