diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2012-02-20 23:57:20 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-22 11:30:02 +0100 |
| commit | 6b7746e8768e1c550b320d5af761f73e5aa37f76 (patch) | |
| tree | ad04aeca4bbc904418d21717f17689f1c0aa5bf7 /drivers/gpu/drm/radeon/rs400.c | |
| parent | drm/radeon: Only create additional ring debugfs files on Cayman or newer. (diff) | |
| download | linux-6b7746e8768e1c550b320d5af761f73e5aa37f76.tar.xz linux-6b7746e8768e1c550b320d5af761f73e5aa37f76.zip | |
drm/radeon/kms: properly set accel working flag and bailout when false
If accel is not working many subsystem such as the ib pool might not be
initialized properly that can lead to segfault inside kernel when cs
ioctl is call with non working acceleration. To avoid this make sure
the accel working flag is false when an error in GPU startup happen and
return EBUSY from cs ioctl if accel is not working.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs400.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs400.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index b0ce84a20a68..866a05be75f2 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -442,6 +442,8 @@ static int rs400_startup(struct radeon_device *rdev) int rs400_resume(struct radeon_device *rdev) { + int r; + /* Make sur GART are not working */ rs400_gart_disable(rdev); /* Resume clock before doing reset */ @@ -462,7 +464,11 @@ int rs400_resume(struct radeon_device *rdev) radeon_surface_init(rdev); rdev->accel_working = true; - return rs400_startup(rdev); + r = rs400_startup(rdev); + if (r) { + rdev->accel_working = false; + } + return r; } int rs400_suspend(struct radeon_device *rdev) |