leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/ttm: always do buffer moves on kernel channel

Browse Source 
There was once good reasons for wanting the drm to be able to use M2MF etc
on user channels, but they're not relevant anymore.  For the general
buffer move case, we've already lost by transferring between vram/sysmem
already so the context switching overhead is minimal in comparison.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-03-16 12:40:17 +10:00
parent 2f5394c3ed
commit accf94969f
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -693,16 +693,12 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
struct ttm_mem_reg *new_mem) struct ttm_mem_reg *new_mem)
{ {
struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev); struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
struct nouveau_channel *chan = chan = dev_priv->channel;
struct nouveau_bo *nvbo = nouveau_bo(bo); struct nouveau_bo *nvbo = nouveau_bo(bo);
struct ttm_mem_reg *old_mem = &bo->mem; struct ttm_mem_reg *old_mem = &bo->mem;
struct nouveau_channel *chan;
int ret; int ret;
chan = nvbo->channel; mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);
if (!chan) {
chan = dev_priv->channel;
mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);
}
/* create temporary vmas for the transfer and attach them to the /* create temporary vmas for the transfer and attach them to the
* old nouveau_mem node, these will get cleaned up after ttm has * old nouveau_mem node, these will get cleaned up after ttm has
@ -734,8 +730,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
} }
out: out:
if (chan == dev_priv->channel) mutex_unlock(&chan->mutex);
mutex_unlock(&chan->mutex);
return ret; return ret;
} }

2
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -113,8 +113,6 @@ struct nouveau_bo {
int pbbo_index; int pbbo_index;
bool validate_mapped; bool validate_mapped;
struct nouveau_channel *channel;
struct list_head vma_list; struct list_head vma_list;
unsigned page_shift; unsigned page_shift;

10
drivers/gpu/drm/nouveau/nouveau_gem.c
View File

@ -426,9 +426,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
return ret; return ret;
} }
nvbo->channel = (b->read_domains & (1 << 31)) ? NULL : chan;
ret = nouveau_bo_validate(nvbo, true, false, false); ret = nouveau_bo_validate(nvbo, true, false, false);
nvbo->channel = NULL;
if (unlikely(ret)) { if (unlikely(ret)) {
if (ret != -ERESTARTSYS) if (ret != -ERESTARTSYS)
NV_ERROR(dev, "fail ttm_validate\n"); NV_ERROR(dev, "fail ttm_validate\n");
@ -678,19 +676,13 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
return PTR_ERR(bo); return PTR_ERR(bo);
} }
/* Mark push buffers as being used on PFIFO, the validation code /* Ensure all push buffers are on validate list */
* will then make sure that if the pushbuf bo moves, that they
* happen on the kernel channel, which will in turn cause a sync
* to happen before we try and submit the push buffer.
*/
for (i = 0; i < req->nr_push; i++) { for (i = 0; i < req->nr_push; i++) {
if (push[i].bo_index >= req->nr_buffers) { if (push[i].bo_index >= req->nr_buffers) {
NV_ERROR(dev, "push %d buffer not in list\n", i); NV_ERROR(dev, "push %d buffer not in list\n", i);
ret = -EINVAL; ret = -EINVAL;
goto out_prevalid; goto out_prevalid;
} }
bo[push[i].bo_index].read_domains |= (1 << 31);
} }
/* Validate buffer list */ /* Validate buffer list */