From: Christian König Date: Mon, 31 Jan 2022 13:20:57 +0000 (+0100) Subject: drm/amdgpu: lower BUG_ON into WARN_ON for AMDGPU_PL_PREEMPT X-Git-Tag: v5.18-rc1~134^2~18^2~101 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0a4459d45425fabd5f020a2117d350c5a07477b;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: lower BUG_ON into WARN_ON for AMDGPU_PL_PREEMPT That should never happen, but make sure that we only warn instead of crash. Signed-off-by: Christian König Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 4b2920af1209e..7b43a0b30102d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -199,7 +199,9 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, BUG_ON(adev->mman.buffer_funcs->copy_max_bytes < AMDGPU_GTT_MAX_TRANSFER_SIZE * 8); - BUG_ON(mem->mem_type == AMDGPU_PL_PREEMPT); + + if (WARN_ON(mem->mem_type == AMDGPU_PL_PREEMPT)) + return -EINVAL; /* Map only what can't be accessed directly */ if (!tmz && mem->start != AMDGPU_BO_INVALID_OFFSET) {