diff options
author | Christian König <christian.koenig@amd.com> | 2016-01-25 07:01:42 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:17:03 -0500 |
commit | fe6b2ad91fd3578d69ef07f0ba35a28c002034b6 (patch) | |
tree | 9ae3a6c2b7310e19519f59ce63101e789083c8e5 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |
parent | 777dbd458c89d4ca74a659f85ffb5bc817f29a35 (diff) |
drm/amdgpu: use WARN_ON_ONCE instead of BUG_ON in the SA
Crashing the system doesn't helps at all. Also properly return
-EINVAL if size or alignment are outside valid ranges.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c index 8b88edb0434b..7d8f8f1e3f7f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |||
@@ -321,8 +321,11 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, | |||
321 | int i, r; | 321 | int i, r; |
322 | signed long t; | 322 | signed long t; |
323 | 323 | ||
324 | BUG_ON(align > sa_manager->align); | 324 | if (WARN_ON_ONCE(align > sa_manager->align)) |
325 | BUG_ON(size > sa_manager->size); | 325 | return -EINVAL; |
326 | |||
327 | if (WARN_ON_ONCE(size > sa_manager->size)) | ||
328 | return -EINVAL; | ||
326 | 329 | ||
327 | *sa_bo = kmalloc(sizeof(struct amdgpu_sa_bo), GFP_KERNEL); | 330 | *sa_bo = kmalloc(sizeof(struct amdgpu_sa_bo), GFP_KERNEL); |
328 | if ((*sa_bo) == NULL) { | 331 | if ((*sa_bo) == NULL) { |