diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 | 
1 files changed, 3 insertions, 4 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 0ecc88df7208..6626a6e64ff5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -317,8 +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 || -	    !dma_buf_is_dynamic(obj->import_attach->dmabuf)) +	if (!drm_gem_is_imported(obj) || !dma_buf_is_dynamic(obj->dma_buf))  		return 0;  	mutex_lock_nested(&vm->process_info->lock, 1);  	if (!WARN_ON(!vm->process_info->eviction_fence)) { @@ -329,7 +328,7 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj,  			dev_warn(adev->dev, "validate_and_fence failed: %d\n", r);  			if (ti) { -				dev_warn(adev->dev, "pid %d\n", ti->pid); +				dev_warn(adev->dev, "pid %d\n", ti->task.pid);  				amdgpu_vm_put_task_info(ti);  			}  		} @@ -1024,7 +1023,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); | 
