From c20370e0969e41bbf735daf932e37ac5ec959213 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed, 7 Nov 2007 18:07:10 +0100
Subject: Don't overwrite TTM page flags.

---
 linux-core/drm_ttm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
 
 
-- 
cgit v1.2.3