diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:47:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:47:20 -0700 |
| commit | dda9cd9fb30dfe6f2a51a394c18aef7c401b497d (patch) | |
| tree | d969967eae1d2d7c00c7f8b3de802eee9a5d19fa /include | |
| parent | afe147466c8f22a69eb470ab504608a9f4ae3345 (diff) | |
| parent | dab8dcfa3c8e3b021a138bee7c17791b4991ba55 (diff) | |
| download | linux-3.10-dda9cd9fb30dfe6f2a51a394c18aef7c401b497d.tar.gz linux-3.10-dda9cd9fb30dfe6f2a51a394c18aef7c401b497d.tar.bz2 linux-3.10-dda9cd9fb30dfe6f2a51a394c18aef7c401b497d.zip | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: don't drop handle reference on unload
drm/ttm: Fix two race conditions + fix busy codepaths
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 4 |
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 267a86c74e2..2040e6c4f17 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -246,9 +246,11 @@ struct ttm_buffer_object { atomic_t reserved; - /** * Members protected by the bo::lock + * In addition, setting sync_obj to anything else + * than NULL requires bo::reserved to be held. This allows for + * checking NULL while reserved but not holding bo::lock. */ void *sync_obj_arg; |