drm/radeon: fix fence related segfault in CS
authorChristian König <deathsimple@vodafone.de>
Tue, 3 Jul 2012 12:05:41 +0000 (14:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2012 15:23:10 +0000 (08:23 -0700)
commit 93bf888c5c730605e3470f5d2381f296eda88d79 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/radeon/radeon_cs.c

index 142f89462aa4ddab99030f7b285a8f6b2e883925..17238f40c4d5556e0fbadb04ea11dbf84fd8dd19 100644 (file)
@@ -377,7 +377,7 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev,
        if (r) {
                DRM_ERROR("Failed to schedule IB !\n");
        }
-       return 0;
+       return r;
 }
 
 static int radeon_bo_vm_update_pte(struct radeon_cs_parser *parser,