Commit a3a9ee4b authored by Christian König's avatar Christian König
Browse files

drm/nouveau: init the base GEM fields for internal BOs 



TTMs buffer objects are based on GEM objects for quite a while
and rely on initializing those fields before initializing the TTM BO.

Nouveau now doesn't init the GEM object for internally allocated BOs,
so make sure that we at least initialize some necessary fields.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210609172902.1937-1-christian.koenig@amd.com
parent fa5239f2

drivers/gpu/drm/nouveau/nouveau_bo.c

+6 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) 
	 */

	if (bo->base.dev)

		drm_gem_object_release(&bo->base);

	else

		dma_resv_fini(&bo->base._resv);



	kfree(nvbo);

}
@@ -330,6 +332,10 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align, 
	if (IS_ERR(nvbo))

		return PTR_ERR(nvbo);



	nvbo->bo.base.size = size;

	dma_resv_init(&nvbo->bo.base._resv);

	drm_vma_node_reset(&nvbo->bo.base.vma_node);



	ret = nouveau_bo_init(nvbo, size, align, domain, sg, robj);

	if (ret)

		return ret;