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/bochs | |
| parent | b5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (diff) | |
| download | linux-stable-f4f4e3e3e9f3bde110067b9e4487cb267d90055a.tar.gz linux-stable-f4f4e3e3e9f3bde110067b9e4487cb267d90055a.tar.bz2 linux-stable-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/bochs')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c index 324f5a09a0a1..66286ff518d4 100644 --- a/drivers/gpu/drm/bochs/bochs_mm.c +++ b/drivers/gpu/drm/bochs/bochs_mm.c @@ -377,7 +377,7 @@ static int bochs_bo_create(struct drm_device *dev, int size, int align, ret = ttm_bo_init(&bochs->ttm.bdev, &bochsbo->bo, size, ttm_bo_type_device, &bochsbo->placement, align >> PAGE_SHIFT, false, NULL, acc_size, - NULL, bochs_bo_ttm_destroy); + NULL, NULL, bochs_bo_ttm_destroy); if (ret) return ret; |