diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-03-12 10:18:33 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-03-12 10:18:33 +0000 |
commit | b6dc381fabb199e70dc681e44e31452af8536313 (patch) | |
tree | 9b25b1a427cba3d3e35d4272e53a482038142242 /linux-core/drm_ttm.c | |
parent | 7f04dd06e6003dd492ae5ddc876121a686f49157 (diff) | |
parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_ttm.c')
-rw-r--r-- | linux-core/drm_ttm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index cc80b132..e991254f 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -299,13 +299,13 @@ int drm_ttm_populate(struct drm_ttm *ttm) return 0; be = ttm->be; - if (ttm->page_flags & DRM_TTM_PAGE_WRITE) { - for (i = 0; i < ttm->num_pages; ++i) { - page = drm_ttm_get_page(ttm, i); - if (!page) - return -ENOMEM; - } + + for (i = 0; i < ttm->num_pages; ++i) { + page = drm_ttm_get_page(ttm, i); + if (!page) + return -ENOMEM; } + be->func->populate(be, ttm->num_pages, ttm->pages, ttm->dummy_read_page); ttm->state = ttm_unbound; return 0; |