diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-01 19:27:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-01 19:27:38 +1000 |
| commit | 7a42e83d36d2d0a68622320900dc4e880b1d920a (patch) | |
| tree | 3671f64e59894284cb7a946d9ab981a1f71e669b /drivers/gpu/drm/nouveau/nouveau_gem.c | |
| parent | c5939a7360a69fc415bcfff6b10ced5227495a48 (diff) | |
| parent | bb6178b04f5ef6f62990306713fb6afdf5d8bc56 (diff) | |
| download | blackbird-op-linux-7a42e83d36d2d0a68622320900dc4e880b1d920a.tar.gz blackbird-op-linux-7a42e83d36d2d0a68622320900dc4e880b1d920a.zip | |
Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next
fixups for nouveau and fencing
* 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux:
drm/nouveau: export reservation_object from dmabuf to ttm
drm/ttm: add reservation_object as argument to ttm_bo_init
drm: Pass dma-buf as argument to gem_prime_import_sg_table
drm/nouveau: assign fence_chan->name correctly
drm/nouveau: specify if interruptible wait is desired in nouveau_fence_sync
drm/nouveau: bump driver patchlevel to 1.2.1
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b7dbd16904e0..36951ee4b157 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -165,7 +165,7 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain, flags |= TTM_PL_FLAG_SYSTEM; ret = nouveau_bo_new(dev, size, align, flags, tile_mode, - tile_flags, NULL, pnvbo); + tile_flags, NULL, NULL, pnvbo); if (ret) return ret; nvbo = *pnvbo; @@ -459,7 +459,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli, return ret; } - ret = nouveau_fence_sync(nvbo, chan, !!b->write_domains); + ret = nouveau_fence_sync(nvbo, chan, !!b->write_domains, true); if (unlikely(ret)) { if (ret != -ERESTARTSYS) NV_PRINTK(error, cli, "fail post-validate sync\n"); |
