Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f7a616 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: return immediately in case of a signal 



When a signal arrives we should return immediately for
handling it and not try other placements first.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e58ab7a

drivers/gpu/drm/ttm/ttm_bo.c

+3 −4
Original line number Diff line number Diff line
@@ -979,7 +979,6 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
	uint32_t cur_flags = 0;

	bool type_found = false;

	bool type_ok = false;

	bool has_erestartsys = false;

	int i, ret;



	ret = reservation_object_reserve_shared(bo->resv, 1);
@@ -1070,8 +1069,8 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
			mem->placement = cur_flags;

			return 0;

		}

		if (ret == -ERESTARTSYS)

			has_erestartsys = true;

		if (ret && ret != -EBUSY)

			return ret;

	}



	if (!type_found) {
@@ -1079,7 +1078,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
		return -EINVAL;

	}



	return (has_erestartsys) ? -ERESTARTSYS : -ENOMEM;

	return -ENOMEM;

}

EXPORT_SYMBOL(ttm_bo_mem_space);