summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-11-07 18:07:10 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-11-07 18:07:56 +0100
commitc20370e0969e41bbf735daf932e37ac5ec959213 (patch)
treeacc4def107490d1355af5b7a906919a468172cb8
parent47497abc1e38081564db429329a3ba16198c1521 (diff)
Don't overwrite TTM page flags.
-rw-r--r--linux-core/drm_ttm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index 8a44070d..1a61ef62 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -264,7 +264,7 @@ int drm_ttm_set_user(struct drm_ttm *ttm,
ttm->user_mm = mm;
ttm->dummy_read_page = dummy_read_page;
- ttm->page_flags = DRM_TTM_PAGE_USER |
+ ttm->page_flags |= DRM_TTM_PAGE_USER |
((write) ? DRM_TTM_PAGE_USER_WRITE : 0);