Commit 4948e6c7 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Alex Deucher
Browse files

drm/amdgpu: Test for imported buffers with drm_gem_is_imported() 



Instead of testing import_attach for imported GEM buffers, invoke
drm_gem_is_imported() to do the test.

v2:
- keep amdgpu_bo_print_info() as-is (Christian)

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a3e510fd

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 
	/* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */

	bo = gem_to_amdgpu_bo(obj);

	domains = amdgpu_display_supported_domains(drm_to_adev(dev), bo->flags);

	if (obj->import_attach && !(domains & AMDGPU_GEM_DOMAIN_GTT)) {

	if (drm_gem_is_imported(obj) && !(domains & AMDGPU_GEM_DOMAIN_GTT)) {

		drm_dbg_kms(dev, "Cannot create framebuffer from imported dma_buf\n");

		drm_gem_object_put(obj);

		return ERR_PTR(-EINVAL);

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ bool amdgpu_dmabuf_is_xgmi_accessible(struct amdgpu_device *adev, 
	if (!adev)

		return false;



	if (obj->import_attach) {

	if (drm_gem_is_imported(obj)) {

		struct dma_buf *dma_buf = obj->import_attach->dmabuf;



		if (dma_buf->ops != &amdgpu_dmabuf_ops)

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
	 */

	if (!vm->is_compute_context || !vm->process_info)

		return 0;

	if (!obj->import_attach ||

	if (!drm_gem_is_imported(obj) ||

	    !dma_buf_is_dynamic(obj->import_attach->dmabuf))

		return 0;

	mutex_lock_nested(&vm->process_info->lock, 1);
@@ -1024,7 +1024,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
		break;

	}

	case AMDGPU_GEM_OP_SET_PLACEMENT:

		if (robj->tbo.base.import_attach &&

		if (drm_gem_is_imported(&robj->tbo.base) &&

		    args->value & AMDGPU_GEM_DOMAIN_VRAM) {

			r = -EINVAL;

			amdgpu_bo_unreserve(robj);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+5 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) 


	amdgpu_bo_kunmap(bo);



	if (bo->tbo.base.import_attach)

	if (drm_gem_is_imported(&bo->tbo.base))

		drm_prime_gem_destroy(&bo->tbo.base, bo->tbo.sg);

	drm_gem_object_release(&bo->tbo.base);

	amdgpu_bo_unref(&bo->parent);
@@ -940,7 +940,7 @@ int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain) 
		domain = bo->preferred_domains & domain;



	/* A shared bo cannot be migrated to VRAM */

	if (bo->tbo.base.import_attach) {

	if (drm_gem_is_imported(&bo->tbo.base)) {

		if (domain & AMDGPU_GEM_DOMAIN_GTT)

			domain = AMDGPU_GEM_DOMAIN_GTT;

		else
@@ -968,7 +968,7 @@ int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain) 
	 */

	domain = amdgpu_bo_get_preferred_domain(adev, domain);



	if (bo->tbo.base.import_attach)

	if (drm_gem_is_imported(&bo->tbo.base))

		dma_buf_pin(bo->tbo.base.import_attach);



	/* force to pin into visible video ram */
@@ -1019,7 +1019,7 @@ void amdgpu_bo_unpin(struct amdgpu_bo *bo) 
	if (bo->tbo.pin_count)

		return;



	if (bo->tbo.base.import_attach)

	if (drm_gem_is_imported(&bo->tbo.base))

		dma_buf_unpin(bo->tbo.base.import_attach);



	if (bo->tbo.resource->mem_type == TTM_PL_VRAM) {
@@ -1264,7 +1264,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 


	amdgpu_bo_kunmap(abo);



	if (abo->tbo.base.dma_buf && !abo->tbo.base.import_attach &&

	if (abo->tbo.base.dma_buf && !drm_gem_is_imported(&abo->tbo.base) &&

	    old_mem && old_mem->mem_type != TTM_PL_SYSTEM)

		dma_buf_move_notify(abo->tbo.base.dma_buf);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_device *bdev, 
	/* if the pages have userptr pinning then clear that first */

	if (gtt->userptr) {

		amdgpu_ttm_tt_unpin_userptr(bdev, ttm);

	} else if (ttm->sg && gtt->gobj->import_attach) {

	} else if (ttm->sg && drm_gem_is_imported(gtt->gobj)) {

		struct dma_buf_attachment *attach;



		attach = gtt->gobj->import_attach;