Commit 703677d9 authored by xinhui pan's avatar xinhui pan Committed by Alex Deucher
Browse files

drm/amdgpu: Fix a deadlock if previous GEM object allocation fails 



Fall through to handle the error instead of return.

Fixes: f8aab604 ("drm/amdgpu: Initialise drm_gem_object_funcs for imported BOs")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f7d6779d

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

+10 −13
Original line number Diff line number Diff line
@@ -341,8 +341,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	r = amdgpu_gem_object_create(adev, size, args->in.alignment,

				     initial_domain,

				     flags, ttm_bo_type_device, resv, &gobj);

	if (r) {

		if (r != -ERESTARTSYS) {

	if (r && r != -ERESTARTSYS) {

		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {

			flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

			goto retry;
@@ -355,8 +354,6 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
		DRM_DEBUG("Failed to allocate GEM object (%llu, %d, %llu, %d)\n",

				size, initial_domain, args->in.alignment, r);

	}

		return r;

	}



	if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) {

		if (!r) {