fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-24 21:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nouveau: enable m2mf for tt<->vram moves, fix fence_poll

Browse source
This commit is contained in:
Ben Skeggs 2008-04-07 13:05:51 +10:00
parent e89710bef7
commit c12b60b509
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linux-core/nouveau_bo.c
View file

@ -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);
}

3
linux-core/nouveau_fence.c
View file

@ -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);