diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-07 18:10:46 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-07 18:10:46 +0100 |
| commit | e9805de5c736f899dea5220ab8b521cc69c9eca6 (patch) | |
| tree | 98d888143f2809e15891d7408b84d5c4bba86398 /linux-core | |
| parent | c07dd80269fad45fdad61de0a43fe3d15cd1a119 (diff) | |
| parent | c20370e0969e41bbf735daf932e37ac5ec959213 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_ttm.c | 2 |
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); |