diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-09 11:03:15 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-30 14:04:00 +0200 |
| commit | f4f4e3e3e9f3bde110067b9e4487cb267d90055a (patch) | |
| tree | 8a90f83235d7ea09adc9ac64fb44a87e823feddb /drivers/gpu/drm/nouveau | |
| parent | b5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (diff) | |
| download | blackbird-op-linux-f4f4e3e3e9f3bde110067b9e4487cb267d90055a.tar.gz blackbird-op-linux-f4f4e3e3e9f3bde110067b9e4487cb267d90055a.zip | |
drm/ttm: add reservation_object as argument to ttm_bo_init
This allows importing reservation objects from dma-bufs.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 049f5de90928..7034cacaa4a1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -230,7 +230,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&drm->ttm.bdev, &nvbo->bo, size, type, &nvbo->placement, align >> PAGE_SHIFT, false, NULL, acc_size, sg, - nouveau_bo_del_ttm); + NULL, nouveau_bo_del_ttm); if (ret) { /* ttm will call nouveau_bo_del_ttm if it fails.. */ return ret; |
