diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-10-01 13:05:48 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-10-02 13:25:46 +1000 |
| commit | 0c853620f4c8ac71ee653c5e25dee160f4a881ba (patch) | |
| tree | 02bf2fb9071f79be4649d1ffc133c391df38169d | |
| parent | 05fff0161aec653771bd39928fbbbed9121e908a (diff) | |
| download | nouveau-0c853620f4c8ac71ee653c5e25dee160f4a881ba.tar.gz | |
drm-next 1dadba87cba20989c5a5a56f2a86fe6672e37c30
| -rw-r--r-- | drm/nouveau_bo.h | 2 | ||||
| -rw-r--r-- | drm/nouveau_ttm.c | 2 | ||||
| -rw-r--r-- | drm/nv84_fence.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drm/nouveau_bo.h b/drm/nouveau_bo.h index ae95b2d43..f238def41 100644 --- a/drm/nouveau_bo.h +++ b/drm/nouveau_bo.h @@ -1,6 +1,8 @@ #ifndef __NOUVEAU_BO_H__ #define __NOUVEAU_BO_H__ +#include <drm/drm_gem.h> + struct nouveau_channel; struct nouveau_fence; struct nouveau_vma; diff --git a/drm/nouveau_ttm.c b/drm/nouveau_ttm.c index e81d08657..753a6def6 100644 --- a/drm/nouveau_ttm.c +++ b/drm/nouveau_ttm.c @@ -281,7 +281,7 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma) struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev); if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) - return drm_mmap(filp, vma); + return -EINVAL; return ttm_bo_mmap(filp, vma, &drm->ttm.bdev); } diff --git a/drm/nv84_fence.c b/drm/nv84_fence.c index a2f28082c..1e5017f90 100644 --- a/drm/nv84_fence.c +++ b/drm/nv84_fence.c @@ -120,6 +120,7 @@ nv84_fence_context_del(struct nouveau_channel *chan) nouveau_bo_vma_del(bo, &fctx->dispc_vma[i]); } + nouveau_bo_wr32(priv->bo, chan->chid * 16 / 4, fctx->base.sequence); nouveau_bo_vma_del(priv->bo, &fctx->vma_gart); nouveau_bo_vma_del(priv->bo, &fctx->vma); nouveau_fence_context_del(&fctx->base); @@ -159,8 +160,6 @@ nv84_fence_context_new(struct nouveau_channel *chan) ret = nouveau_bo_vma_add(bo, cli->vm, &fctx->dispc_vma[i]); } - nouveau_bo_wr32(priv->bo, chan->chid * 16/4, 0x00000000); - if (ret) nv84_fence_context_del(chan); return ret; |