diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-05 05:15:32 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-05 05:15:32 +1100 |
| commit | 9096d50df7ac99f44d043556420f9f9f54e59b3f (patch) | |
| tree | 840f1fa121c98414a50ed1e37a9ae33a3c9232c1 /linux-core | |
| parent | 6abbbb2f4f5b6b280077a6c88bb643507c8ec8fa (diff) | |
nouveau: disable m2mf buffer move for the moment
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/nouveau_buffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/nouveau_buffer.c b/linux-core/nouveau_buffer.c index 7683defb..80ba1759 100644 --- a/linux-core/nouveau_buffer.c +++ b/linux-core/nouveau_buffer.c @@ -54,7 +54,8 @@ static int nouveau_bo_fence_type(struct drm_buffer_object *bo, uint32_t *fclass, uint32_t *type) { - *fclass = 0; + /* When we get called, *fclass is set to the requested fence class */ + if (bo->mem.mask & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE)) *type = 3; else @@ -216,7 +217,7 @@ nouveau_bo_move(struct drm_buffer_object *bo, int evict, int no_wait, return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } else { - if (nouveau_bo_move_m2mf(bo, evict, no_wait, new_mem)) +// if (nouveau_bo_move_m2mf(bo, evict, no_wait, new_mem)) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } return 0; |