diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-07-03 08:05:41 -0400 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2012-07-17 04:31:54 -0400 |
| commit | 93bf888c5c730605e3470f5d2381f296eda88d79 (patch) | |
| tree | 331b0e7355992b64cc9f6da7fac56457f1e72419 /drivers/gpu/drm/radeon/radeon_cs.c | |
| parent | 35e56bd0a42f06b215741fb94bc8d1e42e946449 (diff) | |
drm/radeon: fix fence related segfault in CS
Don't return success if scheduling the IB fails, otherwise
we end up with an oops in ttm_eu_fence_buffer_objects.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index f1b75275f59..d5aec095d35 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
| @@ -358,7 +358,7 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev, | |||
| 358 | if (r) { | 358 | if (r) { |
| 359 | DRM_ERROR("Failed to schedule IB !\n"); | 359 | DRM_ERROR("Failed to schedule IB !\n"); |
| 360 | } | 360 | } |
| 361 | return 0; | 361 | return r; |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | static int radeon_bo_vm_update_pte(struct radeon_cs_parser *parser, | 364 | static int radeon_bo_vm_update_pte(struct radeon_cs_parser *parser, |