diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-07 17:25:13 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-07 17:25:13 +0100 |
| commit | c1fbd8a56653b91af57a408bbcf20a760a2bd8c8 (patch) | |
| tree | 7da84cce76fa47b7950a2f849d2fbd4b5925b223 /linux-core/drm_ttm.h | |
| parent | af24465b2eddfcc5296edc830ea5ed86065a4abd (diff) | |
Checkpoint commit.
Flag handling and memory type selection cleanup.
glxgears won't start.
Diffstat (limited to 'linux-core/drm_ttm.h')
| -rw-r--r-- | linux-core/drm_ttm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_ttm.h b/linux-core/drm_ttm.h index 3f649281..6f62712d 100644 --- a/linux-core/drm_ttm.h +++ b/linux-core/drm_ttm.h @@ -96,8 +96,9 @@ extern void drm_ttm_fixup_caching(drm_ttm_t * ttm); extern int drm_destroy_ttm(drm_ttm_t * ttm); -#define DRM_MASK_VAL(dest, mask, val) \ - (dest) = ((dest) & ~(mask)) | ((val) & (mask)); +#define DRM_FLAG_MASKED(_old, _new, _mask) {\ +(_old) ^= (((_old) ^ (_new)) & (_mask)); \ +} #define DRM_TTM_MASK_FLAGS ((1 << PAGE_SHIFT) - 1) #define DRM_TTM_MASK_PFN (0xFFFFFFFFU - DRM_TTM_MASK_FLAGS) |