diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-07 13:05:51 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-07 13:05:51 +1000 |
| commit | c12b60b5094fe97db60cd0f18fafd1720679bd38 (patch) | |
| tree | 6b593457c6700d7a2e0769a3c906e6a2f76ef019 /linux-core | |
| parent | e89710bef7691e4e9d0bc7d427542bfae6ce4258 (diff) | |
nouveau: enable m2mf for tt<->vram moves, fix fence_poll
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/nouveau_bo.c | 3 | ||||
| -rw-r--r-- | linux-core/nouveau_fence.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux-core/nouveau_bo.c b/linux-core/nouveau_bo.c index 7a899769..fcda3037 100644 --- a/linux-core/nouveau_bo.c +++ b/linux-core/nouveau_bo.c @@ -259,12 +259,11 @@ 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); } if (0) { - nouveau_bo_move_m2mf(bo, 0, 0, NULL); nouveau_bo_move_gart(bo, 0, 0, NULL); } diff --git a/linux-core/nouveau_fence.c b/linux-core/nouveau_fence.c index 59dcf7d0..4ad51ae4 100644 --- a/linux-core/nouveau_fence.c +++ b/linux-core/nouveau_fence.c @@ -80,12 +80,11 @@ nouveau_fence_poll(struct drm_device *dev, uint32_t class, uint32_t waiting_type struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_fence_class_manager *fc = &dev->fm.fence_class[class]; struct nouveau_channel *chan = dev_priv->fifos[class]; - uint32_t pending_types = 0; DRM_DEBUG("class=%d\n", class); DRM_DEBUG("pending: 0x%08x 0x%08x\n", waiting_types, fc->waiting_types); - if (pending_types) { + if (waiting_types & DRM_FENCE_TYPE_EXE) { uint32_t sequence = NV_READ(chan->ref_cnt); DRM_DEBUG("got 0x%08x\n", sequence); |