diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2019-08-05 16:01:08 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-08-06 08:21:54 +0200 |
commit | f8659be8addd731480037eb44ecb521084ae1d11 (patch) | |
tree | 7d67811863bef2127ed420cc4333aa785ecb1331 /drivers/gpu/drm/nouveau/nouveau_prime.c | |
parent | c105de2828e13931cd218e8b801cd6762b618992 (diff) | |
download | kernel_replicant_linux-f8659be8addd731480037eb44ecb521084ae1d11.tar.gz kernel_replicant_linux-f8659be8addd731480037eb44ecb521084ae1d11.tar.bz2 kernel_replicant_linux-f8659be8addd731480037eb44ecb521084ae1d11.zip |
drm/nouveau: use embedded gem object
Drop drm_gem_object from nouveau_bo, use the
ttm_buffer_object.base instead.
Build tested only.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-7-kraxel@redhat.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_prime.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_prime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 8478c3c9ffcd..e86ad7ae622b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -79,13 +79,13 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, /* Initialize the embedded gem-object. We return a single gem-reference * to the caller, instead of a normal nouveau_bo ttm reference. */ - ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size); + ret = drm_gem_object_init(dev, &nvbo->bo.base, nvbo->bo.mem.size); if (ret) { nouveau_bo_ref(NULL, &nvbo); return ERR_PTR(-ENOMEM); } - return &nvbo->gem; + return &nvbo->bo.base; } int nouveau_gem_prime_pin(struct drm_gem_object *obj) |